Mindy DelliCarpini
47889a36ac
am e0221f02: am d7c44ee6: Merge "deblue notification dividers" into klp-dev
...
* commit 'e0221f02ac3b541a57235d3d242a64c7ae646e3b':
deblue notification dividers
2013-10-09 13:19:40 -07:00
Mindy DelliCarpini
e0221f02ac
am d7c44ee6: Merge "deblue notification dividers" into klp-dev
...
* commit 'd7c44ee6b676d1c80fa6ad3763d718f8f2ff1554':
deblue notification dividers
2013-10-09 13:16:09 -07:00
Mindy DelliCarpini
d7c44ee6b6
Merge "deblue notification dividers" into klp-dev
2013-10-09 20:14:15 +00:00
Eino-Ville Talvala
f3eb72edaa
am 8233b6eb: am aa014300: Merge "Camera2: Properly copy over user tag when cloning requests" into klp-dev
...
* commit '8233b6ebd7b54a92502bf93ca23e17d1628f4ff7':
Camera2: Properly copy over user tag when cloning requests
2013-10-09 12:48:04 -07:00
Eino-Ville Talvala
8233b6ebd7
am aa014300: Merge "Camera2: Properly copy over user tag when cloning requests" into klp-dev
...
* commit 'aa0143006f7e873995698dbec2045984b5228fb7':
Camera2: Properly copy over user tag when cloning requests
2013-10-09 12:46:27 -07:00
Eino-Ville Talvala
aa0143006f
Merge "Camera2: Properly copy over user tag when cloning requests" into klp-dev
2013-10-09 19:44:34 +00:00
Dianne Hackborn
9eacd26755
am 1ee0c1c3: am efeb6f3c: Merge "Fix issue #11087316 : Can\'t run dumpsys procstats on user builds in some cases!" into klp-dev
...
* commit '1ee0c1c3d0c8f07b847a392202afef115b89a78d':
Fix issue #11087316 : Can't run dumpsys procstats on user builds in some cases!
2013-10-09 12:21:44 -07:00
Dianne Hackborn
1ee0c1c3d0
am efeb6f3c: Merge "Fix issue #11087316 : Can\'t run dumpsys procstats on user builds in some cases!" into klp-dev
...
* commit 'efeb6f3c1b6123188e78b1c8a15e0eb331ebc8ee':
Fix issue #11087316 : Can't run dumpsys procstats on user builds in some cases!
2013-10-09 12:18:14 -07:00
Dianne Hackborn
efeb6f3c1b
Merge "Fix issue #11087316 : Can't run dumpsys procstats on user builds in some cases!" into klp-dev
2013-10-09 19:15:35 +00:00
Dianne Hackborn
08b36a47cf
Fix issue #11087316 : Can't run dumpsys procstats on user builds in some cases!
...
Once we pass the dump perm check, we are safe.
Change-Id: I58f483573874ca9f8f914fb94137f8a2afafaf25
2013-10-09 12:14:11 -07:00
Craig Mautner
f3366c9ec8
am af47d751: am e8a057a9: Merge "Remove overly tight constraint on drawn Keyguard." into klp-dev
...
* commit 'af47d751b39d7badc268d7a467078b92052f417b':
Remove overly tight constraint on drawn Keyguard.
2013-10-09 12:13:53 -07:00
Craig Mautner
af47d751b3
am e8a057a9: Merge "Remove overly tight constraint on drawn Keyguard." into klp-dev
...
* commit 'e8a057a9aea661a9398ddaa3161e7ea6ab6675b8':
Remove overly tight constraint on drawn Keyguard.
2013-10-09 12:12:14 -07:00
Craig Mautner
e8a057a9ae
Merge "Remove overly tight constraint on drawn Keyguard." into klp-dev
2013-10-09 19:10:45 +00:00
John Spurlock
bba545e73c
am 4f241a29: am 92128144: Merge "Introduce View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
...
* commit '4f241a293bfef3a311b0fd75c37ae01a0bf770f5':
Introduce View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
2013-10-09 11:37:45 -07:00
John Spurlock
4f241a293b
am 92128144: Merge "Introduce View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
...
* commit '92128144d95e913a6702586cf4f0468bcb90c0c4':
Introduce View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
2013-10-09 11:34:03 -07:00
John Spurlock
92128144d9
Merge "Introduce View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev
2013-10-09 18:27:53 +00:00
Svetoslav
fdcd50f13d
am 53f16ba2: am 0cc8276d: Merge "Add missing locking when updating the accessibility node info cache." into klp-dev
...
* commit '53f16ba2b24d6045b880923632cbddd6bee4cd3c':
Add missing locking when updating the accessibility node info cache.
2013-10-09 11:00:42 -07:00
Svetoslav
53f16ba2b2
am 0cc8276d: Merge "Add missing locking when updating the accessibility node info cache." into klp-dev
...
* commit '0cc8276d3a277ab527c0ae9efd3528efc124f380':
Add missing locking when updating the accessibility node info cache.
2013-10-09 10:57:14 -07:00
Svetoslav
0cc8276d3a
Merge "Add missing locking when updating the accessibility node info cache." into klp-dev
2013-10-09 17:55:16 +00:00
Jeff Sharkey
cb8c4501d4
am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev
...
* commit 'd92dd8ffcf3e7bce7d331e7ae9101ccba02baa67':
Install providers enabled after app started.
2013-10-09 10:53:35 -07:00
Jeff Sharkey
d92dd8ffcf
am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev
...
* commit 'fcd8a39edbac3ab77894e8a4b05d2b0ff4841315':
Install providers enabled after app started.
2013-10-09 10:50:10 -07:00
Adam Lesinski
3a18a92ee5
am 92fba41f: am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev
...
* commit '92fba41f3c64407f6827399bfa40bbcf6eac9212':
Allow killed task to remove itself
2013-10-09 10:48:47 -07:00
Jeff Sharkey
fcd8a39edb
Merge "Install providers enabled after app started." into klp-dev
2013-10-09 17:45:11 +00:00
Adam Lesinski
92fba41f3c
am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev
...
* commit '9d958f69939e884450e5bd6588dedb16aefed6e4':
Allow killed task to remove itself
2013-10-09 10:41:39 -07:00
Adam Lesinski
9d958f6993
Merge "Allow killed task to remove itself" into klp-dev
2013-10-09 17:36:57 +00:00
John Spurlock
a12dccc098
Introduce View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
...
The existing View.SYSTEM_UI_FLAG_IMMERSIVE flag will be somewhat
redefined. Swiping will clear the flags, revealing the normal bars.
The new View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY flag will enable
hideybars - the auto-hiding, semi-transparent bar mode.
Bug:11062108
Change-Id: Ibf8be9072f0075953baa4580cd976e7562d44455
2013-10-09 12:35:52 -04: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
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