Craig Mautner
ec8ac30614
am c667f054: am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
...
* commit 'c667f054d5b5a87247cd84d78d483dc1c97af41a':
DO NOT MERGE. Test for Configuration differences before changing.
2014-02-06 14:17:28 -08:00
John Reck
ef129d8442
am 393fdbec: Merge "Remove overdraw counter"
...
* commit '393fdbec9f3f11d277e1631c2e36362e408cbbdc':
Remove overdraw counter
2014-02-06 14:17:25 -08:00
Adam Lesinski
95e17980c5
am 9f97de13: am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
...
* commit '9f97de13359662c2709eed227b3fab2ce7d5dabc':
Check feature bits before loading optional services
2014-02-06 14:17:22 -08:00
Jeff Sharkey
be781e26aa
am 2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor."
...
* commit '2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
Update DrmOutputStream to use raw FileDescriptor.
2014-02-06 14:17:18 -08:00
Craig Mautner
a9080e9b01
am d1c2c542: Test for Configuration differences before changing.
...
* commit 'd1c2c5421181b988f09fd12d9633e2a7c2a8ab60':
Test for Configuration differences before changing.
2014-02-06 14:17:15 -08:00
Craig Mautner
c667f054d5
am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
...
* commit '43ef013cbd769533737135af5a338898cc619602':
DO NOT MERGE. Test for Configuration differences before changing.
2014-02-06 20:36:56 +00:00
Craig Mautner
43ef013cbd
am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
...
* commit '38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
DO NOT MERGE. Test for Configuration differences before changing.
2014-02-06 20:29:49 +00:00
Craig Mautner
38f7dcd7dc
DO NOT MERGE. Test for Configuration differences before changing.
...
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug 12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
2014-02-06 12:27:20 -08:00
John Reck
393fdbec9f
Merge "Remove overdraw counter"
2014-02-06 20:26:37 +00:00
Adam Lesinski
9f97de1335
am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
...
* commit 'a5a93f559d337ad5b79716b05ea43707eb779dc8':
Check feature bits before loading optional services
2014-02-06 20:25:51 +00:00
Adam Lesinski
a5a93f559d
am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
...
* commit '7f416631413e75a1756bd316a2e1906725d72f24':
Check feature bits before loading optional services
2014-02-06 20:16:30 +00:00
Adam Lesinski
7f41663141
Merge "Check feature bits before loading optional services" into klp-modular-dev
2014-02-06 20:13:21 +00:00
John Reck
593b19a49e
Remove overdraw counter
...
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
2014-02-06 11:26:23 -08:00
Jeff Sharkey
2b1252ddd2
Merge "Update DrmOutputStream to use raw FileDescriptor."
2014-02-06 18:50:05 +00:00
Craig Mautner
d1c2c54211
Test for Configuration differences before changing.
...
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug 12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
2014-02-06 10:31:41 -08:00
Jeff Sharkey
ebf8ad5d91
Update DrmOutputStream to use raw FileDescriptor.
...
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.
Also return flag indicating if deleteOlderFiles() actually deleted
anything. Update tests to verify.
Bug: 5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
2014-02-06 09:47:38 -08:00
Andreas Huber
0bf51fc094
am b341a24b: Merge "Remove no longer needed http proxy handling code, it\'s obsolete now"
...
* commit 'b341a24b2adbb67cdc34ade0a19570ee37f0cb82':
Remove no longer needed http proxy handling code, it's obsolete now
2014-02-06 09:13:10 -08:00
Andreas Huber
b341a24b2a
Merge "Remove no longer needed http proxy handling code, it's obsolete now"
2014-02-06 17:10:31 +00:00
Jessica Hummel
3c3e16e041
am e33e2ca3: Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
...
* commit 'e33e2ca3460c0e5a898e5b0406d86b16b96f735a':
Extend DeviceOwner concept to accommodate ProfileOwners
2014-02-06 02:25:23 -08:00
Jessica Hummel
e33e2ca346
Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
2014-02-06 10:23:00 +00:00
Adam Connors
776c555d95
Extend DeviceOwner concept to accommodate ProfileOwners
...
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.
Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
2014-02-06 10:07:19 +00:00
Deepanshu Gupta
30164eee82
am 6886e3ac: am 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '6886e3ac185b4ee2d5e2cf054b4beb0d9c55b18f':
Add methods for Time_Delegate
2014-02-05 19:18:30 -08:00
Deepanshu Gupta
bd40c264cf
am f7994e89: am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit 'f7994e89e94d55998e63e9ebe74a8f10c05ccb3a':
Optimize layout rendering in layoutlib
2014-02-05 19:18:27 -08:00
Deepanshu Gupta
748ca8dbc5
am a859670d: am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit 'a859670d0a135d9a33b57fcc450fafa09d9c5a7f':
Add missing files to fix libphonenumber for layoutlib.
2014-02-05 19:18:24 -08:00
Deepanshu Gupta
abbe45e81e
am 3a9d89e2: am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit '3a9d89e28885d5d92423b9d28a1a2430b65e1559':
Fix the measurement of text bounds.
2014-02-05 19:18:21 -08:00
Deepanshu Gupta
dacbd2ac7c
am 1c064691: am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
...
* commit '1c06469101464c147058c01bc25c9e4b3c1aa16b':
Fix a bug in Nine Patch library.
2014-02-05 19:18:18 -08:00
Deepanshu Gupta
6886e3ac18
am 7bd287b7: am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '7bd287b70a1c95c96663a6028e9809fd3844f55a':
Add methods for Time_Delegate
2014-02-06 03:15:37 +00:00
Deepanshu Gupta
f7994e89e9
am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit '6a9cbd5a2d56782e94b870735df51d32314684d8':
Optimize layout rendering in layoutlib
2014-02-06 03:15:33 +00:00
Deepanshu Gupta
a859670d0a
am f9021e48: am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit 'f9021e48bedc9fda9bff4e33244e689fb06e8ecb':
Add missing files to fix libphonenumber for layoutlib.
2014-02-06 03:15:30 +00:00
Deepanshu Gupta
3a9d89e288
am 1bcc286d: am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit '1bcc286def646f98747bce2c4dedb0737d5fcf9d':
Fix the measurement of text bounds.
2014-02-06 03:15:26 +00:00
Deepanshu Gupta
1c06469101
am 1bceb982: am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
...
* commit '1bceb9823f7af258489c91fa201214805744fa4a':
Fix a bug in Nine Patch library.
2014-02-06 03:15:22 +00:00
Deepanshu Gupta
7bd287b70a
am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit 'ea2ec77f9538de2ea795d3e257f19e8cff659665':
Add methods for Time_Delegate
2014-02-06 03:06:38 +00:00
Deepanshu Gupta
6a9cbd5a2d
am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit 'a0023027e5b7245e2cef304d96826a7ae1c361aa':
Optimize layout rendering in layoutlib
2014-02-06 03:06:35 +00:00
Deepanshu Gupta
f9021e48be
am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit 'bd762373964eb3cb71bdd79cbf82c27faa22699d':
Add missing files to fix libphonenumber for layoutlib.
2014-02-06 03:06:32 +00:00
Deepanshu Gupta
1bcc286def
am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit 'db0427a0ac986e0823e7bbe9b7c12a97aabe133e':
Fix the measurement of text bounds.
2014-02-06 03:06:29 +00:00
Deepanshu Gupta
1bceb9823f
am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
...
* commit '650d30c5ec3c0b345651a56c45eb334fabf51b17':
Fix a bug in Nine Patch library.
2014-02-06 03:06:26 +00:00
Deepanshu Gupta
ea2ec77f95
am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '3adb34ee079504b5854d23bc7a38dafc0a985219':
Add methods for Time_Delegate
2014-02-06 03:03:54 +00:00
Deepanshu Gupta
a0023027e5
am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit '23de8dc2625d4aeb4dc9085c5865ed571f96261a':
Optimize layout rendering in layoutlib
2014-02-06 03:03:50 +00:00
Deepanshu Gupta
bd76237396
am 096e4359: am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit '096e43590381b218cec88adeac4261427c19e139':
Add missing files to fix libphonenumber for layoutlib.
2014-02-06 03:03:45 +00:00
Deepanshu Gupta
db0427a0ac
am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit '5800b19a7a3422620cb28e2327a96bf824f5cc9c':
Fix the measurement of text bounds.
2014-02-06 03:03:41 +00:00
Deepanshu Gupta
650d30c5ec
am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
...
* commit 'b156c0197d052dd4be71ad2b858acc01f50ad49f':
Fix a bug in Nine Patch library.
2014-02-06 03:03:36 +00:00
Craig Mautner
bca9aa172c
am af04b113: am 14d74b82: am 1bf2b873: Defer detach until animations are complete.
...
* commit 'af04b113dcd28ae788a3ffb4a5420817cb7ed95f':
Defer detach until animations are complete.
2014-02-05 19:00:16 -08:00
Craig Mautner
55e0da9326
am 643ca1e9: am 481b54be: am dc548483: Move activities from DisplayContent to TaskStack
...
* commit '643ca1e9a3fba3b815534048bf4249a1f8a134b3':
Move activities from DisplayContent to TaskStack
2014-02-05 19:00:13 -08:00
Deepanshu Gupta
3adb34ee07
am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '9fcfbfe296d7033ee031171f61b3a33044abee42':
Add methods for Time_Delegate
2014-02-06 02:59:51 +00:00
Deepanshu Gupta
23de8dc262
am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit '28e049ef73f5d9301a198ac53535442b697b7ef4':
Optimize layout rendering in layoutlib
2014-02-06 02:59:48 +00:00
Deepanshu Gupta
096e435903
am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit 'f2f108fe86337a429a0940f264761dbc27f817fe':
Add missing files to fix libphonenumber for layoutlib.
2014-02-06 02:59:45 +00:00
Deepanshu Gupta
5800b19a7a
am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16':
Fix the measurement of text bounds.
2014-02-06 02:59:41 +00:00
Deepanshu Gupta
b156c0197d
am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
...
* commit 'd5129e75968030620a1372e39fcfbc17fe584e17':
Fix a bug in Nine Patch library.
2014-02-06 02:59:38 +00:00
Deepanshu Gupta
9fcfbfe296
am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '3bf38b4165877274067a385cfe6472639a203a58':
Add methods for Time_Delegate
2014-02-06 02:56:45 +00:00
Craig Mautner
af04b113dc
am 14d74b82: am 1bf2b873: Defer detach until animations are complete.
...
* commit '14d74b82363e1a72b967590ee7118b239b276fb4':
Defer detach until animations are complete.
2014-02-06 02:56:44 +00:00