Joe Fernandez
095d2c61ed
am 4a8ade3b: am 1f7cee21: Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev
...
* commit '4a8ade3b85b606c5d3c582bdc4eb06051bce7283':
Support Library 18.1 Release Notes
2013-09-16 10:21:14 -07:00
Kenny Root
dbbe56c1b3
Merge "Add comment header for API 20 in public.xml"
2013-09-16 17:19:28 +00:00
Joe Fernandez
4a8ade3b85
am 1f7cee21: Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev
...
* commit '1f7cee21e1506c8476a926f0d37b747a825e9f4a':
Support Library 18.1 Release Notes
2013-09-16 10:19:27 -07:00
Joe Fernandez
1f7cee21e1
Merge "Support Library 18.1 Release Notes" into jb-mr2-ub-dev
2013-09-16 17:18:10 +00:00
Daniel Sandler
cf1d31dbdb
am ad22ba0e: am 3a6b61ff: New ADB icon for K.
...
* commit 'ad22ba0e19d59f49f2278ed70c95e60f3a2521ca':
New ADB icon for K.
2013-09-16 10:17:36 -07:00
Daniel Sandler
ad22ba0e19
am 3a6b61ff: New ADB icon for K.
...
* commit '3a6b61ffcdf2c278f26f1530a5d41b825b33ca18':
New ADB icon for K.
2013-09-16 10:14:27 -07:00
Zhijun He
cfa553369f
ImageReader: get correct crop size
...
Bug: 10752797
Change-Id: I2e56d69cde7f5ca669a366646b876861b277a239
2013-09-16 09:49:28 -07:00
Daniel Sandler
3a6b61ffcd
New ADB icon for K.
...
Simple, to the point.
Bug: 10605145
Change-Id: Id33e06cc0ad9dba0f18cf2919adb3541ed5f0e3d
2013-09-16 12:15:12 -04:00
John Spurlock
f935ea5468
am 3739e911: am 6421aa06: Merge "Fix glitch launching new windows from transparent launcher." into klp-dev
...
* commit '3739e91176c3c62f1674abd177d078e8de5392cb':
Fix glitch launching new windows from transparent launcher.
2013-09-16 08:59:05 -07:00
John Spurlock
3739e91176
am 6421aa06: Merge "Fix glitch launching new windows from transparent launcher." into klp-dev
...
* commit '6421aa061a66312466bfa659e7fcad14c8f18834':
Fix glitch launching new windows from transparent launcher.
2013-09-16 08:57:27 -07:00
John Spurlock
6421aa061a
Merge "Fix glitch launching new windows from transparent launcher." into klp-dev
2013-09-16 15:56:15 +00:00
John Spurlock
eda1f69844
Fix glitch launching new windows from transparent launcher.
...
Part 1 of 2: Ignore remembered sysui visibility transparent flag
value when computing global content frame.
Since this fixes a visible window layout glitch, get this in asap.
Bug:10561554
Change-Id: Ia3fd69ee65eb3f34fb3a684b697c98e37fabc0b0
2013-09-16 11:38:44 -04:00
Daniel Sandler
fe904ecc97
am 48591ef6: am 28ed00d3: Merge "Fix RenderScript crash." into klp-dev
...
* commit '48591ef67e92bbb80a2a263b6813a8afcd9c2788':
Fix RenderScript crash.
2013-09-16 08:29:46 -07:00
Daniel Sandler
48591ef67e
am 28ed00d3: Merge "Fix RenderScript crash." into klp-dev
...
* commit '28ed00d3b7931c75ac97d1aced01b1dda465f07f':
Fix RenderScript crash.
2013-09-16 08:28:16 -07:00
Daniel Sandler
28ed00d3b7
Merge "Fix RenderScript crash." into klp-dev
2013-09-16 15:26:50 +00:00
Daniel Sandler
a30b7035ce
Fix RenderScript crash.
...
Also lay the groundwork for a future checkin.
Bug: 10240151
Bug: 10505742
Change-Id: I62d61c9048188c93863c8c43839e713b75a65102
2013-09-16 11:19:15 -04:00
John Spurlock
abf0f51196
am 19bea5ef: am a751d97e: Merge "Fix layout glitch specific to quick-settings -> settings." into klp-dev
...
* commit '19bea5efdfa80e97f718d5a6043c69bb4a9a10c7':
Fix layout glitch specific to quick-settings -> settings.
2013-09-16 06:26:04 -07:00
John Spurlock
19bea5efdf
am a751d97e: Merge "Fix layout glitch specific to quick-settings -> settings." into klp-dev
...
* commit 'a751d97e8611d16a2929c538f634a4b4c7b2938a':
Fix layout glitch specific to quick-settings -> settings.
2013-09-16 06:23:37 -07:00
John Spurlock
a751d97e86
Merge "Fix layout glitch specific to quick-settings -> settings." into klp-dev
2013-09-16 13:20:49 +00:00
Jonathan Dixon
d8025a727a
am a25f350a: (-s ours) am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev
...
* commit 'a25f350add985422e04c38e74d00ff91f5f555de':
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
2013-09-15 20:37:16 -07:00
Jonathan Dixon
a25f350add
am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev
...
* commit '7c0e2122c0e9bcb83c082156d5f5300b7f62169b':
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
2013-09-15 20:34:31 -07:00
Jonathan Dixon
231a845e6f
am 1dd56b65: (-s ours) am c39a9ca9: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit '1dd56b656b86667a294c0d6c51fd39acf236d036':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-09-15 20:32:47 -07:00
Jonathan Dixon
7c0e2122c0
Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev
2013-09-16 03:32:09 +00:00
Jonathan Dixon
1dd56b656b
am c39a9ca9: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
...
* commit 'c39a9ca95d98e70fc1de8a1b3aeaf7e7075ff868':
Hide Experimental WebView from dev settings DO NOT MERGE
2013-09-15 20:29:55 -07:00
Jonathan Dixon
c39a9ca95d
Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev
2013-09-16 03:27:50 +00:00
Jonathan Dixon
dc1573595c
Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
...
Bug 10769282
Reverting temporary patch required for factory rom.
This reverts commit 292fd0351be8f414cbe32a7eb322bd18158685d9.
2013-09-16 03:09:43 +00:00
Jonathan Dixon
3d458ab916
Hide Experimental WebView from dev settings DO NOT MERGE
...
Bug 10427705
The persist.webview system property is no longer needed, so removed too.
Change-Id: I99bbf2e9b9ec42f282339c72509fd99b18594ebf
2013-09-16 03:08:41 +00:00
Christopher Tate
0a7b5eaf0f
am 88b24415: am 06dc8484: Fix handling of privileged permissions on update
...
* commit '88b244151a7d870d9a4cbca8d8e5abb3c5c1dfac':
Fix handling of privileged permissions on update
2013-09-15 18:54:52 -07:00
Christopher Tate
88b244151a
am 06dc8484: Fix handling of privileged permissions on update
...
* commit '06dc8484b4bf4028eed1e289b1d441eecaa22edf':
Fix handling of privileged permissions on update
2013-09-15 18:51:43 -07:00
Christopher Tate
06dc8484b4
Fix handling of privileged permissions on update
...
When a bundled app is upgraded, only reprocess ungranted 'system'
permissions if the bundled apk is privileged.
Also adds the 'privileged' flag to the dumpsys flag summary.
Bug 10503183
Change-Id: Ic6560fc904e5970fc871a155c898744a6607f851
2013-09-15 17:51:04 -07:00
Craig Mautner
042634cc48
am e932a69f: am dc333542: Merge "Add debug logging for b/10689184." into klp-dev
...
* commit 'e932a69f162e3205c8a28e9521bf9ccb9e495ce0':
Add debug logging for b/10689184.
2013-09-15 14:52:29 -07:00
Craig Mautner
e932a69f16
am dc333542: Merge "Add debug logging for b/10689184." into klp-dev
...
* commit 'dc3335429acf184cf67d022de6fe286c3672663a':
Add debug logging for b/10689184.
2013-09-15 14:50:39 -07:00
Craig Mautner
dc3335429a
Merge "Add debug logging for b/10689184." into klp-dev
2013-09-15 21:47:52 +00:00
Craig Mautner
5845812780
Add debug logging for b/10689184.
...
Focus is now on focus. Remove logging when fixed.
Change-Id: Ic0cd2d6bd4e65dac9dd40f4745dd12fb84f687ce
2013-09-15 14:18:54 -07:00
John Spurlock
37d608d7c8
Fix layout glitch specific to quick-settings -> settings.
...
When collapsing panels in code, relinquish focus immediately,
triggering an immediate reeval of current focus in WM,
triggering an immediate reeval of sysui flags,
triggering an immediate system bar transition
with the correct destination content frame.
Otherwise we eventually get around to it, after several layers
of sysui animation delays, but delaying the sysui visibility
re-eval until this point is far too late.
Bug:10696375
Change-Id: I947289667225b6a12bb8c81950df0e2e2d9f1f99
2013-09-15 15:46:28 -04:00
Zhijun He
68ebc1a7b4
Camera2: Add MAX_CAMERAS_IN_USE error case handling
...
Throw CAE with reason MAX_CAMERAS_IN when the error code is EDQUOT.
Bug: 10749544
Change-Id: I6820de8b95662a55bb37f099746ea2cbe5056f24
2013-09-15 11:55:44 -07:00
Svetoslav Ganov
a6df7120f4
am b30e185b: am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
...
* commit 'b30e185b440e04eac5119653a2868395554febfe':
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 11:50:44 -07:00
Svetoslav Ganov
b30e185b44
am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev
...
* commit '4244d66a122258adc86a8d757d3fe5f9588a59f8':
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 11:48:10 -07:00
Svetoslav Ganov
4244d66a12
Merge changes Id0a67846,I20b57d66 into klp-dev
...
* changes:
Print system may get stuck bound to a print service
Spooler should not crash if print service config activities are not exported.
2013-09-15 18:46:02 +00:00
Svetoslav Ganov
de4fa2dfe2
Print system may get stuck bound to a print service
...
1. If a print service dies, is restarted and at the time of the
restart the service has neither print jobs nor a discovery
serssion it gets stuck into a bound state. Now it unbinds if
after binding and ensuring it is in the lifecycle state right
before the death there are no active print jobs and no discovery
session.
Also when a print service dies we fail all of its print jobs
but did not update the service that all of its print jobs are
handled, i.e. it has no active print jobs.
2. Fixed a null pointer exception in UserState
bug:10696723
Change-Id: Id0a67846093fca5d4c1e10843eaf6aa90169d942
2013-09-15 02:58:14 -07:00
Baligh Uddin
fc49e61f18
am 1c1b87e2: (-s ours) am 3386b07e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '1c1b87e2cf95428241b0a1e4b96a8d0854e98b1e':
Import translations. DO NOT MERGE
2013-09-14 21:44:48 -07:00
Baligh Uddin
852ac08874
am 2e4de5f7: (-s ours) am 215da064: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '2e4de5f7b7925149fa4b84a1709a45d00e0d94d7':
Import translations. DO NOT MERGE
2013-09-14 21:40:44 -07:00
Baligh Uddin
aefb9c972b
am 9f7b6d20: (-s ours) am 694980e0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '9f7b6d20e577c192af4871a375324bd4b6fccbca':
Import translations. DO NOT MERGE
2013-09-14 21:40:41 -07:00
Baligh Uddin
07af779409
am f315b6d5: (-s ours) am def10485: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f315b6d5d5e704fda8375c658565ac901185a154':
Import translations. DO NOT MERGE
2013-09-14 21:40:38 -07:00
Baligh Uddin
0f2e2826d9
am e232759b: (-s ours) am 169a37ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e232759b3ca043262902d2bb12f7be5288fbd5d4':
Import translations. DO NOT MERGE
2013-09-14 21:40:35 -07:00
Baligh Uddin
1c1b87e2cf
am 3386b07e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '3386b07ef1efbe091ab14719e9f8b61fa419d839':
Import translations. DO NOT MERGE
2013-09-14 21:39:35 -07:00
Baligh Uddin
3386b07ef1
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-15 04:36:52 +00:00
Baligh Uddin
2e4de5f7b7
am 215da064: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '215da064f74d3afe8f3991305ca019317e81f4f4':
Import translations. DO NOT MERGE
2013-09-14 21:35:27 -07:00
Baligh Uddin
9f7b6d20e5
am 694980e0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '694980e075f05e7c0038c2c0c06153a13fb84149':
Import translations. DO NOT MERGE
2013-09-14 21:35:23 -07:00
Baligh Uddin
f315b6d5d5
am def10485: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'def10485e32ee32d36a07fe7183de59369dabd28':
Import translations. DO NOT MERGE
2013-09-14 21:35:21 -07:00