116891 Commits

Author SHA1 Message Date
Jake Hamby
acb6a0cef5 am dc80e672: am beb46cc1: am b3a69c5d: Merge "Fix NPE in CallerInfo.getCurrentCountryIso()." into klp-dev
* commit 'dc80e672d07c14c3959bd869cc4cd963ff08a878':
  Fix NPE in CallerInfo.getCurrentCountryIso().
2013-10-09 09:13:51 -07:00
Jean-Michel Trivi
cfed3656c0 am f2177bae: am 2d06e69c: am c04337aa: Merge "Make RemoteController weakly referenced by IRemoteControlDisplay" into klp-dev
* commit 'f2177bae2da4c73bb2180efe154b3f7abb615370':
  Make RemoteController weakly referenced by IRemoteControlDisplay
2013-10-09 09:13:39 -07:00
Jim Miller
8b7c726444 am 94b9d0cb: am eb9a619e: am 888022cf: Merge "Fix default clock localization in keyguard." into klp-dev
* commit '94b9d0cb96bc272778b2c15effa8437fb41f3d65':
  Fix default clock localization in keyguard.
2013-10-09 09:13:19 -07:00
Ed Heyl
8e66069ea9 am 224bb832: am 047b7088: am 984001af: merge in KFS78N (no-op)
* commit '224bb83200c0c3617d0b69cc23eb2cbb68a35d4c':
  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-09 09:13:15 -07:00
Ed Heyl
09012f8236 am 39858e30: am 4951ebb9: am bf2993b1: merge in KQS81M
* commit '39858e30913a722250f5396d3231891e4310ad51': (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-09 09:12:12 -07:00
Adam Powell
8a434894e4 am 91211072: am b43a22e3: am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev
* commit '91211072485e76e788e7fcc0e323b39ade9c6f94':
  Close context menu dialogs if the menu becomes empty
2013-10-09 09:11:57 -07:00
Dan Sandler
5078e451ce am abdc01c6: am bc16fdc0: am 0dfec173: Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev
* commit 'abdc01c6fb9b50c98d62f557a0b40312886ff15e':
  Revert "Show no_sim icon when no SIM card is available."
2013-10-09 09:11:53 -07:00
Kenny Guy
29bcc91388 Merge "Fix null pointer exception when updating rotation tile." 2013-10-09 13:06:03 +00:00
Jeff Sharkey
e6ea79b4b1 am 63595859: am e6d419de: Merge "Grab Activity reference before leaving fragment." into klp-dev
* commit '6359585916905f17537e6db5d0cb9eb2dbac00f2':
  Grab Activity reference before leaving fragment.
2013-10-09 00:30:24 -07:00
Jeff Sharkey
6359585916 am e6d419de: Merge "Grab Activity reference before leaving fragment." into klp-dev
* commit 'e6d419de77344300e342c8a0f6c013afeec87a72':
  Grab Activity reference before leaving fragment.
2013-10-09 00:28:03 -07:00
Jeff Sharkey
e6d419de77 Merge "Grab Activity reference before leaving fragment." into klp-dev 2013-10-09 07:26:11 +00:00
Craig Mautner
4e8a19c73a Remove overly tight constraint on drawn Keyguard.
The requirement that a window that is invisible will not be drawn is
incorrect. In particular the test fails before a surface has even been
added (mHasSurface == false) or shown (mPolicyVisibility == false).
This was causing the screen to turn on before Keyguard had been drawn
and exposing surfaces that would have normally remained hidden.

Also, don't pass null into KeyguardServiceDelegate.onShown() or we
will immediately turn the screen on before Keyguard is drawn.

Fixes bug 11062635.

Change-Id: I964c7ef186d0a94678020b9c27ca6b79e5433350
2013-10-08 21:32:37 -07:00
Eino-Ville Talvala
7b01c5c4d2 Camera2: Properly copy over user tag when cloning requests
Bug: 11141002
Change-Id: Icc5c4150a6796d705f5c6c3bd1322597fc986af2
2013-10-08 19:46:02 -07:00
Lorenzo Colitti
f62c9ab2ec am 18225508: am 2845e519: Merge "Fix captive portal detection on IPv6 networks." into klp-dev
* commit '18225508dd8c9d833c1699ad17a6bba4e4a46c4f':
  Fix captive portal detection on IPv6 networks.
2013-10-08 19:18:51 -07:00
Lorenzo Colitti
18225508dd am 2845e519: Merge "Fix captive portal detection on IPv6 networks." into klp-dev
* commit '2845e5196aacb2f3ee3131d8ae09038fa8336389':
  Fix captive portal detection on IPv6 networks.
2013-10-08 19:16:43 -07:00
Lorenzo Colitti
2845e5196a Merge "Fix captive portal detection on IPv6 networks." into klp-dev 2013-10-09 02:14:43 +00:00
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
Svetoslav
3edcd8cfdf Add missing locking when updating the accessibility node info cache.
bug:10489954

Change-Id: Iccf55d074ea712566f441b9f6616a4c1fe847e0a
2013-10-08 18:31:58 -07:00
Yuhao Zheng
a9e6be83ae WifiStateMachine: fix for exiting L2ConnectedState
After a L2ConnectedState to WpsRunningState transition, network is disconnected.
However, the disconnected message is ignored by WpsRunningState, leaving DHCP
still running. When entering L2ConnectedState again, WifiStateMachine gets stuck
on waiting for DhcpStateMachine, because DHCP is already running and the command
CMD_START_DHCP is ignored. Calling handleNetworkDisconnect() when exiting
L2ConnectedState fixes this problem, plus it handles disconnection correctly.

Bug: 10900241
Change-Id: Id29e4989b29db7e64719940cf93eba1f1a90912a
2013-10-08 18:16:03 -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
Jeff Sharkey
78b1370308 Grab Activity reference before leaving fragment.
When creating a new directory, we spawn an AsyncTask and finish the
fragment.  This change keeps an Activity reference to report the
result back to.

Bug: 11137561
Change-Id: Icfccc5e50e8f53a50dced589e1564d64457e0ed0
2013-10-08 17:11:49 -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
Jeff Sharkey
dd97f4233f Install providers enabled after app started.
When an app has already been started, and a ContentProvider component
is enabled with DONT_KILL_APP, use the existing ProcessRecord to
install the provider.

Bug: 11118692
Change-Id: I990f18b337eb19768ee1db895f1e2eb982046cce
2013-10-08 17:02:26 -07: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
Svetoslav
e039b0fe67 am e0ac69db: am ea7f975b: am dcd05b44: Merge "Fix a crash in the select printers activity." into klp-dev
* commit 'e0ac69db93991e80be866e54571cfe6c15d9dc4f':
  Fix a crash in the select printers activity.
2013-10-08 16:02:58 -07:00
Nick Kralevich
23c888acab am fa06d03e: am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure."
* commit 'fa06d03edf7b40f62615c58233dbdf135bac11df':
  Fix App Ops permission mapping structure.
2013-10-08 16:02:54 -07:00
Michael Jurka
d32437fd99 am c9456566: am 04a938cf: am c39bfa9f: Merge "Wallpaper cropper should inherit translucent theme" into klp-dev
* commit 'c9456566c879b82155018a8bdf0a72d3896b1d8f':
  Wallpaper cropper should inherit translucent theme
2013-10-08 16:02:51 -07:00
John Spurlock
8c65d2f179 am 08de4b32: am b772eb3c: am fe124594: Merge "Tweak status bar gradient." into klp-dev
* commit '08de4b3279d9c34707f6aef4f49588ebf7059e5c':
  Tweak status bar gradient.
2013-10-08 16:02:47 -07:00
Jeff Sharkey
f22abb961b am ac50f60d: am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev
* commit 'ac50f60da6ae9943321d4fe945e81d14dff0d4c2':
  Add secondary external storage support.
2013-10-08 16:02:40 -07:00
Dianne Hackborn
e02c3eec84 am 19a6a86a: am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev
* commit '19a6a86ae148b3ee15ef7499302e9ed7c1bea682':
  Wrong argument: handleUnstableProviderDiedLocked
2013-10-08 16:02:34 -07:00
Alan Viverette
e94ec3e79a am 57cc6283: am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev
* commit '57cc628355e434d4b313e9b60e1a68a0643fda04':
  Fix HIDE_DESCENDANTS accessibility importance mode
2013-10-08 16:02:29 -07:00
Daniel Sandler
32bc10303c am 4be3db70: am f3a56199: am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev
* commit '4be3db7018154406ab74e029482a7d82dbcd3a5a':
  Don't wake users up with low battery sounds.
2013-10-08 16:02:16 -07:00
Daniel Sandler
1eaac4559f am d78b94a9: am 59089be1: am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev
* commit 'd78b94a96bdbfe5b9742c50f221c2923fdd9be8e':
  Out with the sliders, in with the cog.
2013-10-08 16:02:13 -07: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