113391 Commits

Author SHA1 Message Date
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
19c8b395dc am 6c3baf12: Preload DexCaches
* commit '6c3baf12e0a6417177793a2e7e95d22721203813':
  Preload DexCaches
2013-10-08 18:39:42 -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
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
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
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
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
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
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
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
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
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
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
Alan Viverette
3a407fad35 Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev 2013-10-08 20:14:21 +00:00
Daniel Sandler
f3a56199a5 am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev
* commit '40bacdf4843ac227b8a19cea47f4424138c8490f':
  Don't wake users up with low battery sounds.
2013-10-08 13:05:14 -07:00
Daniel Sandler
59089be16e am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev
* commit 'cd85db331dd319d63f57f7b4c942bc506606b5b0':
  Out with the sliders, in with the cog.
2013-10-08 13:05:11 -07:00
Daniel Sandler
40bacdf484 Merge "Don't wake users up with low battery sounds." into klp-dev 2013-10-08 20:03:06 +00:00
Daniel Sandler
cd85db331d Merge "Out with the sliders, in with the cog." into klp-dev 2013-10-08 20:02:49 +00:00
Jeff Sharkey
44cbdec292 Add secondary external storage support.
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs.  Give secondary volumes valid state
until vold reports back.

Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
2013-10-08 12:57:11 -07:00
Michael Jurka
33c493e653 Wallpaper cropper should inherit translucent theme
Change-Id: Icd13130d6250759c71ef016f62d10d7359cf067e
2013-10-08 12:47:22 -07:00
You Kim
bc74de6722 Wrong argument: handleUnstableProviderDiedLocked
mProvider is HashMap<ProviderKey, ProviderClientRecord>. String
is not correct object for KEY. Complete removal using iterator.

Bug: 11086495

Change-Id: I51e4576544ef02ede6f96938689dd4e43ec6eb4f
2013-10-08 12:22:30 -07:00
Svetoslav
53e8a26d61 Fix a crash in the select printers activity.
When the search view is attached and detached we announce that
 for accessibility. The trouble is that if the activity is being
 torn down we are trying to access resources from a fragment that
 is detached and the qcrash occurs. This change does not try to
 access resources if the activity is finishing and also we do not
 load resource strings if accessibility is not enabled.

bug:11127814

Change-Id: I4a47a8ed3b6a13544cf17b4395560246a33f0e2d
2013-10-08 12:05:24 -07:00
Jim Miller
d00284c3af am c23ee579: Merge "Disable dragging the challenge area when there are no widgets" into klp-dev
* commit 'c23ee579ac21f1f67a30d75e8ac7cbd49ba2fe7d':
  Disable dragging the challenge area when there are no widgets
2013-10-08 11:40:09 -07:00
Jim Miller
c23ee579ac Merge "Disable dragging the challenge area when there are no widgets" into klp-dev 2013-10-08 18:38:26 +00:00
John Spurlock
2bef87ccc6 am 4268600f: Merge "Translucent sysui flags affect layout." into klp-dev
* commit '4268600f39ff8cf19dcb84c7e13f4c208a8e8127':
  Translucent sysui flags affect layout.
2013-10-08 11:36:39 -07:00
John Spurlock
4268600f39 Merge "Translucent sysui flags affect layout." into klp-dev 2013-10-08 18:34:57 +00:00
Daniel Sandler
dea6462aab Don't wake users up with low battery sounds.
Battery sounds will always play when the screen is on, and
then for Settings.Global.LOW_BATTERY_SOUND_TIMEOUT
milliseconds after the screen goes off. After that, low
battery alerts will be pushed out the airlock until the
screen comes back on again.

If battery sounds are suppressed via this mechanism you'll
see a log line like:

	V/PowerUI ( 3161): screen off too long (5779ms, limit
	5000ms): not waking up the user with low battery sound

The default value of LOW_BATTERY_SOUND_TIMEOUT is a settings
provider resource: R.integer.def_low_battery_sound_timeout.

Bug: 10487557
Change-Id: Iddd42038aa630631dc8f1833f20fcc5a0c646681
2013-10-08 17:37:06 +00:00
Chris Craik
2b126b6c40 am 46ec729a: Merge "Clean up unused resources" into klp-dev
* commit '46ec729a88079d3878a95a57ab703e64638dfc1a':
  Clean up unused resources
2013-10-08 10:29:29 -07:00