Chris Craik
0feb86b0d7
am 26efb5bf: am e6e0bfed: Merge "Fix action bar background drawing" into lmp-dev
...
* commit '26efb5bf4ebc90a15cecdb38be70e7239ea3723f':
Fix action bar background drawing
2014-08-13 21:15:20 +00:00
Chris Craik
722b9568af
am e6e0bfed: Merge "Fix action bar background drawing" into lmp-dev
...
* commit 'e6e0bfed05ad1bbfa6c4818db55d7631cc88ce67':
Fix action bar background drawing
2014-08-13 21:10:35 +00:00
Jae Seo
6b8ea6e56d
am 930ab23a: am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev
...
* commit '930ab23aaf41163f09a83a3060e1f1b78cb5af0c':
TIF: Create TvInputState only once per each input
2014-08-13 20:24:16 +00:00
Jae Seo
87b02e9ccc
am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev
...
* commit '7d206d9b71b35814c81d601a098cdad6438f7676':
TIF: Create TvInputState only once per each input
2014-08-13 20:18:56 +00:00
Amith Yamasani
b0dd621ef3
am 6648994f: am 5884bca0: Decouple user limit from guest creation
...
* commit '6648994f02769f957a197deef011291d11a390b8':
Decouple user limit from guest creation
2014-08-13 20:18:50 +00:00
Jeff Sharkey
d468092c24
am c9c98188: am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev
...
* commit 'c9c9818872697b17e84fa329603264bcd6210e73':
Fix javadoc attr reference.
2014-08-13 20:18:45 +00:00
Amith Yamasani
170ad7f32d
am 5884bca0: Decouple user limit from guest creation
...
* commit '5884bca02326813ae809e80e5f3678cedde2a706':
Decouple user limit from guest creation
2014-08-13 20:13:11 +00:00
Jeff Sharkey
ba8d9fa70c
am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev
...
* commit '9096e1b2791f1feb49fb53e327de150e0e0b5e67':
Fix javadoc attr reference.
2014-08-13 20:13:06 +00:00
Amith Yamasani
95ab784944
Decouple user limit from guest creation
...
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
and a Guest.
Limit number of guests and managed profiles that can
be added.
Added unit tests.
Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
2014-08-13 20:09:20 +00:00
keunyoung
fa4c60cf63
am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
...
* commit 'a90c8cba81ab4721e4d440d4ddd0a9710bf62def':
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
2014-08-13 20:00:50 +00:00
Andres Morales
3e7951c9f1
am aabd0ad4: am 98b4b65c: Mark PDBManager as a SystemApi
...
* commit 'aabd0ad4149928935af1c2a3d4e331a6cdfe7d96':
Mark PDBManager as a SystemApi
2014-08-13 20:00:45 +00:00
keunyoung
1cae0ebdd9
am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
...
* commit '64c0b0b68d9d1321cc1772d6d875001c5f37c33b':
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
2014-08-13 19:55:40 +00:00
Andres Morales
46d9143405
am 98b4b65c: Mark PDBManager as a SystemApi
...
* commit '98b4b65c921c9d7f4d2664c2142133041494411c':
Mark PDBManager as a SystemApi
2014-08-13 19:55:36 +00:00
Adrian Roos
7e8502fdf3
am 9244bd6d: am cf4d504e: Merge "QS UserSwitcher: Update exit guest string" into lmp-dev
...
* commit '9244bd6d100b25099f7d3c0e05755451b3fe3fe6':
QS UserSwitcher: Update exit guest string
2014-08-13 19:48:56 +00:00
Adrian Roos
dcf2c2ddb1
am fa2dca7e: am 009cd491: Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev
...
* commit 'fa2dca7ec0fa55dd78589bb20c7c62401dd83609':
Status bar header: Fix Settings shortcut content description
2014-08-13 19:48:52 +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
Adrian Roos
02bb98b3b2
am df08e58a: am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction
...
* commit 'df08e58a28a604e29ad4e0cb81d0d7f2aadaa048':
Trust: Insecure unlock also removes disable-trust-on-boot restriction
2014-08-13 19:40:49 +00:00
Adrian Roos
15931b1d99
am cf4d504e: Merge "QS UserSwitcher: Update exit guest string" into lmp-dev
...
* commit 'cf4d504e708a18bf804191f88ef59c748993e1c7':
QS UserSwitcher: Update exit guest string
2014-08-13 19:40:24 +00:00
Adrian Roos
7214a63250
am 009cd491: Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev
...
* commit '009cd49180827302ff63c67a83efcbf20a8f424f':
Status bar header: Fix Settings shortcut content description
2014-08-13 19:40:19 +00:00
Chulwoo Lee
976fc317a3
am 63fd6565: am f62931dc: Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev
...
* commit '63fd6565f5fac0dc0fc6df1df2b91f24bde6eb25':
TIF: Enable to build uri for browsableOnly channels
2014-08-13 19:36:40 +00:00
Adrian Roos
ffefed058f
am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction
...
* commit 'd63b258c0b40e0177ec8d508281a905ae3dc53ce':
Trust: Insecure unlock also removes disable-trust-on-boot restriction
2014-08-13 19:36:05 +00:00
Chulwoo Lee
04bd234142
am f62931dc: Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev
...
* commit 'f62931dc0f2f44325a47bb7e099734ab8ceeea4d':
TIF: Enable to build uri for browsableOnly channels
2014-08-13 19:31:53 +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
Ihab Awad
f1bff0b1d5
am 162c1c06: am 5ba3f456: Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev
...
* commit '162c1c06b6e1e9eeed2f9e97329d68ec2481da7e':
Final structural tweaks to Telecomm API (1/8)
2014-08-13 19:08:17 +00:00
kmccormick
d7e9550686
am 504ee9f4: am 625e3f89: am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
...
* commit '504ee9f428e63b4c13eeffae057746c4cffd6b40':
Doc Change: Remove obsolete sample link.
2014-08-13 19:08:12 +00:00
Ihab Awad
4368a26040
am 5ba3f456: Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev
...
* commit '5ba3f4563231fd81e3e1c7c56eab66fd9d02d570':
Final structural tweaks to Telecomm API (1/8)
2014-08-13 19:01:31 +00:00
kmccormick
271e19f3d6
am 625e3f89: am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs
...
* commit '625e3f89f20ff7282e095cd48cfa1da64abb17db':
Doc Change: Remove obsolete sample link.
2014-08-13 19:01:27 +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
ztenghui
6e974d745f
am 1d37533d: am e629d02b: Bring back the shadow strength tweak
...
* commit '1d37533dbdb961334b5dd097f6597815e45dbd05':
Bring back the shadow strength tweak
2014-08-13 18:41:50 +00:00
ztenghui
ba69a2454b
am e629d02b: Bring back the shadow strength tweak
...
* commit 'e629d02ba346bf7f14557786ae3171b201cd179f':
Bring back the shadow strength tweak
2014-08-13 18:35:12 +00:00
Craig Mautner
fb16732623
am 72115915: am 3e8ccb9c: Clean up app following death when creating service
...
* commit '721159159f1c0e100150512c392141830eaebba2':
Clean up app following death when creating service
2014-08-13 18:27:54 +00:00
Craig Mautner
bf159f9de5
am 3f4a10a5: am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev
...
* commit '3f4a10a5eac64960bbae4af2b1f44cdc0d5309c3':
Disassociate system windows from apps
2014-08-13 18:27:43 +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
c94196c6d2
am 3e8ccb9c: Clean up app following death when creating service
...
* commit '3e8ccb9ca4e01ff446c22f932cf4d1ab803f3108':
Clean up app following death when creating service
2014-08-13 18:20:43 +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
Ying Wang
97c4390505
am 078d9d80: am d364499e: Remvoe build log spam.
...
* commit '078d9d806fdb8d07e013e2a29989c6a6dbc3a645':
Remvoe build log spam.
2014-08-13 18:13:06 +00:00
Craig Mautner
29d8f9103a
am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev
...
* commit '8844c75aea3708ab29f7dd3cba4b1b8eaaf799aa':
Disassociate system windows from apps
2014-08-13 18:12:40 +00:00
Ying Wang
18eff684be
am d364499e: Remvoe build log spam.
...
* commit 'd364499e393d31ffffa870590734fb8e3efa89b9':
Remvoe build log spam.
2014-08-13 18:08:05 +00:00
Sandeep Siddhartha
9caf4f9da7
am 40d28dd1: am bd3a24b1: Fix delete clause for sound model DB
...
* commit '40d28dd13c0b7d16cb0eb27ab37fae1bdaf102c3':
Fix delete clause for sound model DB
2014-08-13 18:03:58 +00:00
destradaa
fa3f594bda
am 84e1d77c: am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
...
* commit '84e1d77cc8ec8ad1c8f2c6f07eeeb1f1ff62da27':
Update FlpHardwareProvider native layer, to stop raising FatalErrors.
2014-08-13 18:03:53 +00:00
Ying Wang
160c6fc1e9
Remvoe build log spam.
...
Change-Id: I87a0864d1f4d1c01f660f2bb603b5d0b42e19b53
2014-08-13 10:59:46 -07:00
Dianne Hackborn
453c1ba472
am 5c95bce5: am 604f5487: Merge "Fix some IntentFilter docs." into lmp-dev
...
* commit '5c95bce5aa5dd15d933e1daa954864337d5e1f4b':
Fix some IntentFilter docs.
2014-08-13 17:56:05 +00:00
Sandeep Siddhartha
200a0dac54
am bd3a24b1: Fix delete clause for sound model DB
...
* commit 'bd3a24b16033217901b16a639fd2a606368400e1':
Fix delete clause for sound model DB
2014-08-13 17:55:34 +00:00
destradaa
f1076d123b
am fa0ddb7b: Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
...
* commit 'fa0ddb7b8ab4ab741de9ed689b625f704f89ca35':
Update FlpHardwareProvider native layer, to stop raising FatalErrors.
2014-08-13 17:55:30 +00: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
Dianne Hackborn
0ecfe3fc7b
am 604f5487: Merge "Fix some IntentFilter docs." into lmp-dev
...
* commit '604f5487105c9650fa1bc2907b8f666b227e359d':
Fix some IntentFilter docs.
2014-08-13 17:51:20 +00:00
ztenghui
7358bd66dc
am 7fec32e6: am cd65c61f: Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
...
* commit '7fec32e6f2be63f8ac23a4040eb857ac747d48cf':
Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
2014-08-13 17:48:37 +00:00
Stephen Hines
42a33d5bbf
am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels.""
...
* commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d':
Revert "Collapse code paths for single- and multi-input kernels."
2014-08-13 17:43:00 +00:00