Jeff Sharkey
437e61d5ad
Merge "Fix javadoc attr reference." into lmp-dev
2014-08-12 23:14:35 +00:00
Jeff Sharkey
9f991a2f3e
Fix javadoc attr reference.
...
Change-Id: I330ba0cac66b4515388287c0ec4856e3ce6c93cb
2014-08-13 18:38:55 +00:00
ztenghui
14a4e35208
Bring back the shadow strength tweak
...
bug:16712006
Change-Id: Ifc0ecca139d58140b45d7d227536a53069e1d480
2014-08-13 18:22:42 +00:00
Craig Mautner
4a8dddbf18
Clean up app following death when creating service
...
If an app has died, run through the cleanup before relaunching its
service.
Also a little simplifying refactor.
Fixes bug 16979752.
Change-Id: I376cbef2ea00fc626588386317f092cc6dea0bdc
2014-08-13 18:15:28 +00:00
keunyoung
2c1c74afca
Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
2014-08-12 23:14:35 +00:00
Andres Morales
396181b0cb
Mark PDBManager as a SystemApi
...
This will allow us to XTS test these APIs
Change-Id: Ife942f73580ea24eb6801b079b642d7c67107ab0
2014-08-13 19:48:08 +00:00
keunyoung
c093bf2645
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
...
bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
2014-08-13 18:58:03 +00:00
Adrian Roos
9f2bcdb6e2
Merge "QS UserSwitcher: Update exit guest string" into lmp-dev
2014-08-12 23:14:48 +00:00
Adrian Roos
8d2a4e2bf6
QS UserSwitcher: Update exit guest string
...
Bug: 16511180
Change-Id: I2289b25350a46f0bfe1e5495a3c52ddf2aeabb3c
2014-08-13 19:33:51 +00:00
Adrian Roos
9dbe190099
Trust: Insecure unlock also removes disable-trust-on-boot restriction
...
Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
2014-08-13 19:31:29 +00:00
Adrian Roos
ce1965c1f1
Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev
2014-08-12 23:14:48 +00:00
Adrian Roos
b88c884b97
Status bar header: Fix Settings shortcut content description
...
Bug: 15567494
Change-Id: Iff983d3590b6c84ded6cc32c6a611355678e24a1
2014-08-13 19:30:28 +00:00
Craig Mautner
eb829f2f9f
Merge "Disassociate system windows from apps" into lmp-dev
2014-08-12 23:14:35 +00:00
Ying Wang
160c6fc1e9
Remvoe build log spam.
...
Change-Id: I87a0864d1f4d1c01f660f2bb603b5d0b42e19b53
2014-08-13 10:59:46 -07:00
Sandeep Siddhartha
a31413a325
Fix delete clause for sound model DB
...
Since UUIDs contain '-'s they need to be wrapped within quotes
Bug: 16985919
Change-Id: I624a512ca7fc2494a7737b5465c94a9e161dec88
2014-08-13 10:52:17 -07:00
Craig Mautner
a5d29971f8
Disassociate system windows from apps
...
If an app launches a system window remove the app token.
Fixes bug 16825063.
Change-Id: I7c7403e0958f3cd9f6dd5e2964b2e9cabc51ded7
2014-08-12 18:57:49 -07:00
Ihab Awad
df22cbc9ad
Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev
2014-08-12 23:14:35 +00:00
kmccormick
a33ec00e49
am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
...
* commit '7b708ec3178e30a18e4680a9903a65a13b4c32d2':
Doc Change: Remove obsolete sample link.
2014-08-13 18:55:37 +00:00
kmccormick
7b708ec317
am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
...
* commit '0672ea6f3f9f5a8dfcea75b405eb83057746e4e9':
Doc Change: Remove obsolete sample link.
2014-08-13 18:50:43 +00:00
kmccormick
0672ea6f3f
am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
...
* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
Doc Change: Remove obsolete sample link.
2014-08-13 18:43:20 +00:00
Ihab Awad
b19a0bcdd8
Final structural tweaks to Telecomm API (1/8)
...
Bug: 16416927
Bug: 16494880
Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
2014-08-13 11:16:46 -07:00
kmccormick
919176239f
am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs
...
* commit '37bdcbbba2db31f0efb8aa900ba7ce81a710e08c':
Doc Change: remove obsolete links.
2014-08-13 17:09:15 +00:00
kmccormick
37bdcbbba2
am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs
...
* commit 'bcdbe1a0fcb9c24cdc4ee402f29f279ef2b9e7fa':
Doc Change: remove obsolete links.
2014-08-13 17:05:01 +00:00
Robert Ly
84f00277b1
am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
...
* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
2014-08-13 16:12:37 +00:00
Robert Ly
9ada140fc1
am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
...
* commit 'efbbb18241c8b74a2813b48af2aeff8f03fbe8e7':
cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
2014-08-13 16:07:40 +00:00
Robert Ly
efbbb18241
Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs
2014-08-12 23:14:48 +00:00
Chulwoo Lee
b5d88d8973
Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev
2014-08-12 23:14:35 +00:00
Chulwoo Lee
81d1b4def0
TIF: Enable to build uri for browsableOnly channels
...
BUG: 16966138
Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
2014-08-13 12:28:34 -07:00
destradaa
2d8964cca7
Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
2014-08-12 23:14:35 +00:00
destradaa
ff8e6093fa
Update FlpHardwareProvider native layer, to stop raising FatalErrors.
...
b/16800814
Change-Id: Ic619f37c02c7e4dddc4ef06369f8730cbd66e6bd
2014-08-12 19:05:33 -07:00
Yuncheol Heo
e2f7f0a5b8
Merge "Implement MHL RAP reception." into lmp-dev
2014-08-12 23:14:42 +00:00
Yuncheol Heo
08a1be81d7
Implement MHL RAP reception.
...
Bug: 16966458
Change-Id: I77effc917e19072c387be8ba28d6ce1664d16415
2014-08-13 10:26:23 +09:00
keunyoung
48054241eb
fix wrong flag check for virtual display
...
- FLAG_NEVER_BLANK was always set for non-public display
bug: 16958538
Change-Id: Ia147ac3ca39d687e60ec4b77726f6b6e4c3aeb3b
2014-08-13 01:14:19 +00:00
kmccormick
a0197180e7
Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
2014-08-12 23:14:35 +00:00
kmccormick
71f8f1d81f
Doc Change: Remove obsolete sample link.
...
Fix for:
b/16685592
Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82
2014-08-12 18:08:58 -07:00
kmccormick
bcdbe1a0fc
Merge "Doc Change: remove obsolete links." into klp-modular-docs
2014-08-12 23:14:35 +00:00
kmccormick
cb62407d7a
Doc Change: remove obsolete links.
...
Fixes for:
b/16494813
Change-Id: I2aaae520cdafadf8707f2fbf38c10588f0de2987
2014-08-12 17:52:27 -07:00
Dianne Hackborn
3c9ad6ebd8
Merge "Fix some IntentFilter docs." into lmp-dev
2014-08-12 23:14:35 +00:00
ztenghui
eceec05d4c
Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
...
This reverts commit d0a9544a772c906ed68793209d1e4a809174cca2.
2014-08-13 17:25:15 +00:00
Adrian Roos
2bb8bfd1e8
Dismiss bouncer when onTrustInitiatedByUser fires
...
Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.
Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
2014-08-13 17:24:36 +00:00
Adrian Roos
959409b86f
QS Brightness Mirror: Also mirror setMax
...
Follow-up to Ic1f934f9ddbb582453b4b52a4b4402c71ac79654
Bug: 15408618
Change-Id: I3ea82f011f366fe34be2ff07546a7f46c1c3dc55
2014-08-13 17:23:19 +00:00
kmccormick
ca17708880
am 91917623: am 37bdcbbb: am bcdbe1a0: Merge "Doc Change: remove obsolete links." into klp-modular-docs
...
* commit '919176239fd68a801cf4af8c9ba959f1fb574bd8':
Doc Change: remove obsolete links.
2014-08-13 17:15:36 +00:00
Dianne Hackborn
dc894046be
Fix some IntentFilter docs.
...
Change-Id: I1dc6feb41bf275583d8b25ed5ca98d2b1432c752
2014-08-12 18:59:28 -07:00
Dianne Hackborn
deb434ca08
Merge "Add 560dpi, and some other stuff." into lmp-dev
2014-08-12 23:14:35 +00:00
Jae Seo
e253fabbc7
Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev
2014-08-12 23:14:35 +00:00
Jinsuk Kim
8e083ec044
CEC: Remove timeout from deviceSelect processing
...
20-second timeout set for incoming <active source> command after
<set stream path> is moved out of HdmiControlService, to
HDMI input service.
Bug: 16967429
Change-Id: I5b50b0187e562b51e227a29e54824740ca37906e
2014-08-13 00:53:28 +00:00
Jae Seo
550c4b0d4d
TIF: Temporarily disable permission check for parental controls
...
Bug: 16979343
Change-Id: I00ff70194faaf7218151388dc10ce8e4dd3d2728
2014-08-12 17:50:37 -07:00
destradaa
da97066d5a
Merge "Add additional logging around AGPS IP Address handling." into lmp-dev
2014-08-12 23:14:35 +00:00
destradaa
931a37f992
Add additional logging around AGPS IP Address handling.
...
The additional logging is expected to help troubleshoot and prevent the issue tracked by the
following bugs:
b/16875580
b/16961654
Change-Id: Ibee7fe0774efa3db77ab53af96c128ced186b40e
2014-08-12 17:51:01 -07:00
Torne (Richard Coles)
4f82d40e9f
Merge "Add trace events to WebView startup." into lmp-dev
2014-08-12 23:14:49 +00:00