114851 Commits

Author SHA1 Message Date
Brian Carlstrom
2d0f1d655c am 19c8b395: am 6c3baf12: Preload DexCaches
* commit '19c8b395dc13732d0642041b81507038190546ca':
  Preload DexCaches
2013-10-08 18:42:42 -07:00
Brian Carlstrom
19c8b395dc am 6c3baf12: Preload DexCaches
* commit '6c3baf12e0a6417177793a2e7e95d22721203813':
  Preload DexCaches
2013-10-08 18:39:42 -07:00
Jake Hamby
dc80e672d0 am beb46cc1: am b3a69c5d: Merge "Fix NPE in CallerInfo.getCurrentCountryIso()." into klp-dev
* commit 'beb46cc13477a51308baca35166756f223eb10d8':
  Fix NPE in CallerInfo.getCurrentCountryIso().
2013-10-08 17:12:06 -07:00
Brian Carlstrom
6c3baf12e0 Preload DexCaches
Bug: 11045348
Change-Id: Id27333652d4b3b9ace6c1cdf0566bf39bf0084ed
2013-10-08 17:11:17 -07:00
Jake Hamby
beb46cc134 am b3a69c5d: Merge "Fix NPE in CallerInfo.getCurrentCountryIso()." into klp-dev
* commit 'b3a69c5dc3ee39cfb2a06660f0953c4c7b55d21a':
  Fix NPE in CallerInfo.getCurrentCountryIso().
2013-10-08 17:06:24 -07:00
Jake Hamby
b3a69c5dc3 Merge "Fix NPE in CallerInfo.getCurrentCountryIso()." into klp-dev 2013-10-09 00:03:34 +00:00
Jean-Michel Trivi
f2177bae2d am 2d06e69c: am c04337aa: Merge "Make RemoteController weakly referenced by IRemoteControlDisplay" into klp-dev
* commit '2d06e69c31d33cc5d130b3c70a764bef0942cbba':
  Make RemoteController weakly referenced by IRemoteControlDisplay
2013-10-08 16:35:30 -07:00
Jean-Michel Trivi
2d06e69c31 am c04337aa: Merge "Make RemoteController weakly referenced by IRemoteControlDisplay" into klp-dev
* commit 'c04337aa5584405e121d9345932a7dc69bb48e5f':
  Make RemoteController weakly referenced by IRemoteControlDisplay
2013-10-08 16:33:21 -07:00
Jake Hamby
7f5bee01ec Fix NPE in CallerInfo.getCurrentCountryIso().
Internal method CallerInfo.getCurrentCountryIso() can throw NPE
if the country detector's detectCountry() method returns null.
Add code to check that the Country is not null before calling
getCountryIso() on it. Change fallback logic to call
locale.getCountry() whenever countryIso was not assigned.

Bug: 10607906
Change-Id: I08fe3f4d942f67c37a2e6ff0b067fe32ad8a6fa5
2013-10-08 16:31:16 -07:00
Jean-Michel Trivi
c04337aa55 Merge "Make RemoteController weakly referenced by IRemoteControlDisplay" into klp-dev 2013-10-08 23:31:04 +00:00
Jim Miller
94b9d0cb96 am eb9a619e: am 888022cf: Merge "Fix default clock localization in keyguard." into klp-dev
* commit 'eb9a619e151df96aa48d2a8250a332ee1ac93483':
  Fix default clock localization in keyguard.
2013-10-08 16:15:57 -07:00
Ed Heyl
224bb83200 am 047b7088: am 984001af: merge in KFS78N (no-op)
* commit '047b70886330f95da279b7f140ec89313412c034':
  Fix ImageReader onImageAvailable synchronization
  ImageReader: fix the 0 crop rect size issue
  ImageReader: get correct crop size
  media: Update ImageReader to remove MaxImagesAcquiredException
  media: Update ImageReader APIs
  Hide Experimental WebView from dev settings DO NOT MERGE
2013-10-08 16:15:54 -07:00
Jim Miller
eb9a619e15 am 888022cf: Merge "Fix default clock localization in keyguard." into klp-dev
* commit '888022cfd81599e3cf32899f3453c9df44d850e6':
  Fix default clock localization in keyguard.
2013-10-08 16:09:37 -07:00
Ed Heyl
047b708863 am 984001af: merge in KFS78N (no-op)
* commit '984001af8f5fa54d0619a9f4157c87126ae62d89':
  Fix ImageReader onImageAvailable synchronization
  ImageReader: fix the 0 crop rect size issue
  ImageReader: get correct crop size
  media: Update ImageReader to remove MaxImagesAcquiredException
  media: Update ImageReader APIs
  Hide Experimental WebView from dev settings DO NOT MERGE
2013-10-08 16:09:34 -07:00
Jim Miller
888022cfd8 Merge "Fix default clock localization in keyguard." into klp-dev 2013-10-08 23:04:40 +00:00
Ed Heyl
984001af8f merge in KFS78N (no-op) 2013-10-08 15:59:56 -07:00
Ed Heyl
39858e3091 am 4951ebb9: am bf2993b1: merge in KQS81M
* commit '4951ebb9659c8118051d873310754bb161614503': (78 commits)
  wappush: Use valid index for pdu including garbages
  ImageReader: fix the 0 crop rect size issue
  Hide Experimental WebView from dev settings DO NOT MERGE
  Clear names from externally supplied WorkSources to WifiManager (b/10733757)
  Only show launcher for the bottom activity in a task
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
  Ensures that CompatibilityInfo is always set in Resources
  Put soundpooled sounds in the right place.
  Fix a regression in pausing activity immediately on sleep
  TextureView/GLES20Canvas: Support synchronous GLConsumers
  Debug for b/10689184.
  Increasing visibility of pressed feedback for default ui widget assets
  Use a separate thread for services that do NTP lookup
  Also catch one more tablet layout NPE.
  Fix tablet layout and resources.
  New sounds for K.
  Do not assign InputMethod to non-input windows.
  Fix parenthetical error.
  Fix media stress test.
  Update the Connectivity Manager test suit to use InstrumentationTestCase.
  ...
2013-10-08 15:54:03 -07:00
Ed Heyl
4951ebb965 am bf2993b1: merge in KQS81M
* commit 'bf2993b1eddad61c24b60206eeeaf1fd0f01786b': (133 commits)
  wappush: Use valid index for pdu including garbages
  ImageReader: fix the 0 crop rect size issue
  Hide Experimental WebView from dev settings DO NOT MERGE
  Clear names from externally supplied WorkSources to WifiManager (b/10733757)
  Only show launcher for the bottom activity in a task
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
  Ensures that CompatibilityInfo is always set in Resources
  Put soundpooled sounds in the right place.
  Fix a regression in pausing activity immediately on sleep
  TextureView/GLES20Canvas: Support synchronous GLConsumers
  Debug for b/10689184.
  Increasing visibility of pressed feedback for default ui widget assets
  Use a separate thread for services that do NTP lookup
  Also catch one more tablet layout NPE.
  Fix tablet layout and resources.
  New sounds for K.
  Do not assign InputMethod to non-input windows.
  Fix parenthetical error.
  Fix media stress test.
  Update the Connectivity Manager test suit to use InstrumentationTestCase.
  ...
2013-10-08 15:47:34 -07:00
Jean-Michel Trivi
4348a73bbe Make RemoteController weakly referenced by IRemoteControlDisplay
In the RemoteController implementation, the inner class that
 implements the IRemoteControlDisplay interface must have a weak
 link to the RemoteController instance with which it is associated,
 as MediaFocusControl and RemoteControlClient hold a strong
 reference to this binder object in a different remote process.
 Without a weak reference, any object referencing RemoteController
 couldn't be independently garbage collected without a garbage
 collection in the remote process.

Bug 8209392

Change-Id: I29e4274c45249b3cb0d3d89417c69e8fe8f62fc4
2013-10-08 15:42:31 -07:00
Adam Powell
9121107248 am b43a22e3: am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev
* commit 'b43a22e3c870183855cd1c9ba4f9e152ed6d6af7':
  Close context menu dialogs if the menu becomes empty
2013-10-08 15:41:58 -07:00
Dan Sandler
abdc01c6fb am bc16fdc0: am 0dfec173: Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev
* commit 'bc16fdc0a1493e40dfb53e7a46cc7b5d9f363779':
  Revert "Show no_sim icon when no SIM card is available."
2013-10-08 15:41:56 -07:00
Ed Heyl
bf2993b1ed merge in KQS81M 2013-10-08 15:40:08 -07:00
Adam Powell
b43a22e3c8 am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev
* commit '79782d7ced41f548a9eac57473bd93faa4aba8b1':
  Close context menu dialogs if the menu becomes empty
2013-10-08 15:35:58 -07:00
Dan Sandler
bc16fdc0a1 am 0dfec173: Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev
* commit '0dfec173655173b6bcbefa40a4fa0d137ae13e31':
  Revert "Show no_sim icon when no SIM card is available."
2013-10-08 15:35:55 -07:00
Adam Powell
79782d7ced Merge "Close context menu dialogs if the menu becomes empty" into klp-dev 2013-10-08 22:34:26 +00:00
Dan Sandler
0dfec17365 Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev 2013-10-08 22:32:45 +00:00
Jim Miller
38ab277ad4 Fix default clock localization in keyguard.
Uses new DateFormat.getBestDateTimePattern() to get localized format
string.

Fixes bug 11120830

Change-Id: If49a95ac4f222da7d16523c99476c5895326d71e
2013-10-08 15:32:09 -07:00
Dan Sandler
99270a8972 Revert "Show no_sim icon when no SIM card is available."
It doesn't look good in the combo RSSI layout, and while we could make 
it look better by adding some padding (like the airplane icon), we haven't
had a no_sim icon since ICS and people are pretty much OK with it.

This reverts commit 2eeacc02a252607e7c2fd1a00c60d8aa567694cc.

Bug: 11127588
Change-Id: Ibefd6096171588fcab1e3c5174abda9758cc5f6d
2013-10-08 22:31:25 +00:00
Adam Powell
fd71db8445 Close context menu dialogs if the menu becomes empty
If a view triggers showContextMenu while a context menu is already
shown but contributes no items to the menu the menu dialog would
become empty. Simply close the dialog if this happens.

Bug 11063885

Change-Id: I9e7c96073318c94eda5f1e1c4beb596b3d9da781
2013-10-08 15:20:29 -07:00
Svetoslav
e0ac69db93 am ea7f975b: am dcd05b44: Merge "Fix a crash in the select printers activity." into klp-dev
* commit 'ea7f975b957e3361211e250abdc3e46d995001cf':
  Fix a crash in the select printers activity.
2013-10-08 14:35:16 -07:00
Nick Kralevich
fa06d03edf am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure."
* commit '0b8fd029c052784d4adee940eaa904a339db6716':
  Fix App Ops permission mapping structure.
2013-10-08 14:33:40 -07:00
Svetoslav
ea7f975b95 am dcd05b44: Merge "Fix a crash in the select printers activity." into klp-dev
* commit 'dcd05b440d81ededd567a417a6e10a02ccdfa07b':
  Fix a crash in the select printers activity.
2013-10-08 14:32:19 -07:00
Michael Jurka
c9456566c8 am 04a938cf: am c39bfa9f: Merge "Wallpaper cropper should inherit translucent theme" into klp-dev
* commit '04a938cf330ccfbe4c3ce0d9bc63268b08c8467f':
  Wallpaper cropper should inherit translucent theme
2013-10-08 14:31:45 -07:00
John Spurlock
08de4b3279 am b772eb3c: am fe124594: Merge "Tweak status bar gradient." into klp-dev
* commit 'b772eb3c0381dbc2a2f235279c9d2680dcbdbe66':
  Tweak status bar gradient.
2013-10-08 14:31:42 -07:00
Nick Kralevich
0b8fd029c0 am a299862d: Merge "Fix App Ops permission mapping structure."
* commit 'a299862dd2d46fda54678df07db66bef1a63bb9b':
  Fix App Ops permission mapping structure.
2013-10-08 14:30:11 -07:00
Michael Jurka
04a938cf33 am c39bfa9f: Merge "Wallpaper cropper should inherit translucent theme" into klp-dev
* commit 'c39bfa9f0eb16181bb1bb99721eea00af1145416':
  Wallpaper cropper should inherit translucent theme
2013-10-08 14:28:50 -07:00
John Spurlock
b772eb3c03 am fe124594: Merge "Tweak status bar gradient." into klp-dev
* commit 'fe124594d66d4cf7a960bdc97215c0f178444269':
  Tweak status bar gradient.
2013-10-08 14:28:44 -07:00
Svetoslav
dcd05b440d Merge "Fix a crash in the select printers activity." into klp-dev 2013-10-08 21:28:13 +00:00
Michael Jurka
c39bfa9f0e Merge "Wallpaper cropper should inherit translucent theme" into klp-dev 2013-10-08 21:27:14 +00:00
Nick Kralevich
a299862dd2 Merge "Fix App Ops permission mapping structure." 2013-10-08 21:25:24 +00:00
John Spurlock
fe124594d6 Merge "Tweak status bar gradient." into klp-dev 2013-10-08 21:25:11 +00:00
John Spurlock
02b1bdc28a Tweak status bar gradient.
Bug:10967264
Change-Id: I803420ba332934398b4878644e3a168bd99701ad
2013-10-08 17:22:56 -04:00
Jeff Sharkey
ac50f60da6 am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
  Add secondary external storage support.
2013-10-08 14:12:37 -07:00
Jeff Sharkey
58ff8af53a am a6af40cd: Merge "Add secondary external storage support." into klp-dev
* commit 'a6af40cda29837fb68507f431ee5a179db93de28':
  Add secondary external storage support.
2013-10-08 14:09:49 -07:00
Jeff Sharkey
a6af40cda2 Merge "Add secondary external storage support." into klp-dev 2013-10-08 21:05:36 +00:00
Dianne Hackborn
19a6a86ae1 am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev
* commit 'c35ae6e784dcf1a3480fbcc12e09d51bdffce686':
  Wrong argument: handleUnstableProviderDiedLocked
2013-10-08 13:36:53 -07:00
Dianne Hackborn
c35ae6e784 am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev
* commit 'c739a765981174dc82bf268c379a5c7bc17167f4':
  Wrong argument: handleUnstableProviderDiedLocked
2013-10-08 13:33:59 -07:00
Dianne Hackborn
c739a76598 Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 2013-10-08 20:29:47 +00:00
Alan Viverette
57cc628355 am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev
* commit '76597552805f810ff7de15f6fad72a0a89ff5724':
  Fix HIDE_DESCENDANTS accessibility importance mode
2013-10-08 13:19:31 -07:00
Alan Viverette
7659755280 am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev
* commit '3a407fad3554fe9567bb8769b060233b3efc0633':
  Fix HIDE_DESCENDANTS accessibility importance mode
2013-10-08 13:16:38 -07:00