78992 Commits

Author SHA1 Message Date
Romain Guy
98fd5a5fbc am ed130313: am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840" into jb-dev
* commit 'ed1303132912f0d39bcd008c3efbc0422d7433fc':
  Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:33:53 -07:00
Romain Guy
ed13031329 am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840" into jb-dev
* commit '94328c308bc8d283841ac6434d47b4c56389a388':
  Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:28:22 -07:00
Romain Guy
94328c308b Merge "Clear bitmap references from display lists as early as possible Bug #6555840" into jb-dev 2012-05-24 14:25:44 -07:00
Romain Guy
38c2ece5ce Clear bitmap references from display lists as early as possible
Bug #6555840

Apps like Google+ with large bitmaps displayed in listivews could
run into memory issues because of these references.

Change-Id: I39486bda13ce00c5a3b6481139ad54547506a8b4
2012-05-24 14:20:56 -07:00
Robert Greenwalt
4dfc783beb am 8a9d8f06: am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
* commit '8a9d8f068c29b8d195ffdcc250dccf7bcecd5f53':
  Modify logging to debug this issue
2012-05-24 12:34:00 -07:00
Robert Greenwalt
8a9d8f068c am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
* commit '1ed1de7ab2ae03f82500dbf6272bf036d89bd0c9':
  Modify logging to debug this issue
2012-05-24 12:30:20 -07:00
Robert Greenwalt
1ed1de7ab2 Merge "Modify logging to debug this issue" into jb-dev 2012-05-24 12:27:23 -07:00
Eric Laurent
aa5481214f am dcc752a8: am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
* commit 'dcc752a8984361ba23da00bf2adeec4161b67af2':
  AudioManager: restore setBluetoothA2dpOn() method
2012-05-24 11:47:48 -07:00
Jeff Sharkey
fe3297dd34 am a3a7bcbd: am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev
* commit 'a3a7bcbda43ebddbf7bdd70c12258d1f1066c931':
  Advise persist threshold outside NPMS lock.
2012-05-24 11:47:44 -07:00
Eric Laurent
dcc752a898 am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
* commit '90fb2dd6738792ebead64c5f03a4f407d36420de':
  AudioManager: restore setBluetoothA2dpOn() method
2012-05-24 11:42:59 -07:00
Jeff Sharkey
a3a7bcbda4 am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev
* commit '6385ff511dd998f1fbb189621270e2c19577f66e':
  Advise persist threshold outside NPMS lock.
2012-05-24 11:42:53 -07:00
Eric Laurent
90fb2dd673 Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev 2012-05-24 11:39:36 -07:00
Jeff Sharkey
6385ff511d Merge "Advise persist threshold outside NPMS lock." into jb-dev 2012-05-24 11:38:12 -07:00
Fabrice Di Meglio
c30d1ad8f3 am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '07e28d1e9bd7373c83cb66d5d9e93ae9af1f090d':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:13:42 -07:00
George Mount
a893591ff6 am 4f313676: am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
* commit '4f3136768038398e109a66d393d74858d2754a34':
  Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 11:13:25 -07:00
Robert Greenwalt
5a0c320a82 Modify logging to debug this issue
Logging exec time on startUsingNetworkFeature as we've had some reports suggesting it's
causing ANRs.
Remove some logging from NDC so it's local log is more useful.

bug:6492166
Change-Id: I258ff6c59bff2c65935242d50496d84720c5d493
2012-05-24 10:47:10 -07:00
Fabrice Di Meglio
07e28d1e9b am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '0100625bb316ecbd99873b72756ffba8613c3456':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 10:45:54 -07:00
Fabrice Di Meglio
0100625bb3 Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 2012-05-24 10:42:23 -07:00
Jeff Sharkey
e19f39b79c Advise persist threshold outside NPMS lock.
Bug: 6492166
Change-Id: Ibebdc7e9b8cae27c12fd7b61b53ab60287a0364d
2012-05-24 10:21:16 -07:00
Ben Murdoch
b9fcb1334d resolved conflicts for merge of cde7efde to master
Change-Id: I44433670a897c23b3bd388cbba9cfacf80e3345f
2012-05-24 18:02:56 +01:00
George Mount
4f31367680 am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
* commit '222f56135026627637e9db4801d6532b1ff16657':
  Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 09:56:16 -07:00
George Mount
222f561350 Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev 2012-05-24 09:53:17 -07:00
Ben Murdoch
cde7efde0c am a95e9da7: Merge "Make the WebCore thread watchdog opt in." into jb-dev
* commit 'a95e9da760198b06afe0c1bbe828c2f75b52070e':
  Make the WebCore thread watchdog opt in.
2012-05-24 09:33:30 -07:00
Ben Murdoch
a95e9da760 Merge "Make the WebCore thread watchdog opt in." into jb-dev 2012-05-24 09:30:10 -07:00
Brian Colonna
bb05da29e6 am af239b5f: am fd824487: Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev
* commit 'af239b5f74ab95a7f373134e5e94fe51317bfa0c':
  Fix 6449259: FUL no longer overlaps music controls
2012-05-24 08:59:54 -07:00
Brian Colonna
af239b5f74 am fd824487: Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev
* commit 'fd824487dc2dd3eb386148af9a0618aab9a99c60':
  Fix 6449259: FUL no longer overlaps music controls
2012-05-24 08:55:29 -07:00
Brian Colonna
fd824487dc Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev 2012-05-24 08:50:58 -07:00
Jean-Baptiste Queru
6fdd244a50 am 31b5e5d1: am f75b6052: (-s ours) am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
* commit '31b5e5d15972aa7c0e7579798a459c983c5610f9':
  libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 08:12:12 -07:00
Jean-Baptiste Queru
31b5e5d159 am f75b6052: (-s ours) am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
* commit 'f75b6052132f1f748ae77891f6fedd1957508811':
  libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 08:07:45 -07:00
Jean-Baptiste Queru
f75b605213 am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
* commit '55536138cc0febbe83608ee0103aaa9a5202e31f':
  libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 07:59:28 -07:00
George Mount
7e9f62ef48 Use setCustomSelectActionModeCallback to disallow action bar.
Bug 5993716
 Use setCustomSelectActionModeCallback rather than
 setLongClickListener to disallow custom action block so
 that long press can bring up the paste window.

Change-Id: I916e77dcea7914c02191f0ecda37cd126318807d
2012-05-24 07:43:27 -07:00
Jean-Baptiste Queru
819ba00afc am 8a113a4a: am fe34006d: (-s ours) am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"
* commit '8a113a4a9cecdaab0fb439a49cdd26291b1708b8':
  libmedia: Fix build with gcc 4.7
2012-05-24 06:59:01 -07:00
Jean-Baptiste Queru
8a113a4a9c am fe34006d: (-s ours) am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"
* commit 'fe34006d6f2a3c984bcade2cbeb9aaaaef8cc29a':
  libmedia: Fix build with gcc 4.7
2012-05-24 06:55:14 -07:00
Jean-Baptiste Queru
55536138cc Merge "libstagefright/matroska: Fix build with gcc 4.7" 2012-05-24 06:53:51 -07:00
Jean-Baptiste Queru
fe34006d6f am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"
* commit '05cd296e713377c216a4ac5b2d421f4ca0343cda':
  libmedia: Fix build with gcc 4.7
2012-05-24 06:43:50 -07:00
Jean-Baptiste Queru
05cd296e71 Merge "libmedia: Fix build with gcc 4.7" 2012-05-24 06:25:55 -07:00
Ben Murdoch
2b5d66824b Make the WebCore thread watchdog opt in.
Add a setting on WebViewCore to control whether we monitor
the responsiveness of the WebCore thread. Default is not
to monitor.

Bug: 6447214
Change-Id: Ia95e5c769d458dcd24ae50660b2f22e93851956f
2012-05-24 13:01:57 +01:00
satok
c0fbe54f0b am 13236440: am 7018a90c: Fix the issue on matching the locale in TextServicesManagerService
* commit '13236440148d7ab2f56f7c2df03ff41baeb16c7f':
  Fix the issue on matching the locale in TextServicesManagerService
2012-05-24 03:40:01 -07:00
satok
1323644014 am 7018a90c: Fix the issue on matching the locale in TextServicesManagerService
* commit '7018a90c323a7f0deb37939d5505ff112ac637f5':
  Fix the issue on matching the locale in TextServicesManagerService
2012-05-24 03:35:55 -07:00
satok
7018a90c32 Fix the issue on matching the locale in TextServicesManagerService
Bug: 6542210

Change-Id: I42d84b684d5689e8fceecb705bb51d19d847477a
2012-05-24 18:21:45 +09:00
satok
5284148f28 am 77f79a39: am f927e17a: Use correct spell check locale
* commit '77f79a39c0e6aa540f8204adb39ec6671ee053e7':
  Use correct spell check locale
2012-05-24 01:43:32 -07:00
satok
77f79a39c0 am f927e17a: Use correct spell check locale
* commit 'f927e17ae543b6edeae8200cc86c59c3ee740670':
  Use correct spell check locale
2012-05-24 01:39:35 -07:00
satok
f927e17ae5 Use correct spell check locale
Bug: 6542210
Change-Id: I414aa2321f30e396996d90fb8e90c1dbb3bb7b9e
2012-05-24 16:52:54 +09:00
Craig Mautner
74f41ae14d am ca414550: am 67e6070f: Merge "Change method of tracking moving AppWindowTokens." into jb-dev
* commit 'ca414550d3d431345f4efbee762ea87fe55295af':
  Change method of tracking moving AppWindowTokens.
2012-05-23 18:37:37 -07:00
Craig Mautner
1fb5b3d4e6 am 270db713: am 9cf5831f: Merge "Fix jank when launching apps that show wallpaper." into jb-dev
* commit '270db71381e107e3b3bc81890b3f34424403ef9b':
  Fix jank when launching apps that show wallpaper.
2012-05-23 18:34:35 -07:00
Craig Mautner
ca414550d3 am 67e6070f: Merge "Change method of tracking moving AppWindowTokens." into jb-dev
* commit '67e6070fa10bbd313c8ebe0de4e0440b688c569e':
  Change method of tracking moving AppWindowTokens.
2012-05-23 18:34:19 -07:00
Craig Mautner
270db71381 am 9cf5831f: Merge "Fix jank when launching apps that show wallpaper." into jb-dev
* commit '9cf5831f2b94f5e2edd7fd87abef4e9fac8aa82d':
  Fix jank when launching apps that show wallpaper.
2012-05-23 18:31:25 -07:00
Craig Mautner
67e6070fa1 Merge "Change method of tracking moving AppWindowTokens." into jb-dev 2012-05-23 18:30:25 -07:00
Craig Mautner
9cf5831f2b Merge "Fix jank when launching apps that show wallpaper." into jb-dev 2012-05-23 18:29:39 -07:00
Wu-cheng Li
dd850c7903 am a039119e: am c1cabdfb: Merge "Fix bad aspect ratios for recorded effects" into jb-dev
* commit 'a039119e6806d17e0cc9d0e0e249f66525853935':
  Fix bad aspect ratios for recorded effects
2012-05-23 18:02:49 -07:00