drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,683 Commits 1 Branch 0 Tags
Commit Graph

56629 Commits

Author SHA1 Message Date
Narayan Kamath
8da7810224 am 0f575a9e: am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 
* commit '0f575a9e65ee1baa0edcde2e8eaa123958c47870':
  Fix getPackageInfo for the "android" package in the system server.
 2014-08-15 21:11:16 +00:00
Narayan Kamath
b7f70bddf3 am 9b0fe82e: am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 
* commit '9b0fe82e88a0e1d7e806f9ca7c5966bc009b00ac':
  Fix getPackageInfo for the "android" package in the system server.
 2014-08-15 20:58:38 +00:00
Narayan Kamath
178d65729e am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 
* commit 'f58fd973f4f9f712d9d97b26e6c3afd22145463a':
  Fix getPackageInfo for the "android" package in the system server.
 2014-08-15 18:04:01 +00:00
Andres Morales
6573b4a2d3 am 8c403f56: am cec4f99b: am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 
* commit '8c403f56cdf9bd0251ef9fefebbe002e09efe740':
  Fix issue where unlock handlers are not properly updated
 2014-08-15 17:40:04 +00:00
Andres Morales
46ceea564f am cec4f99b: am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 
* commit 'cec4f99b1def705ea006256923bbf59306d2a7c0':
  Fix issue where unlock handlers are not properly updated
 2014-08-15 17:32:09 +00:00
Andres Morales
63cec26dd0 am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 
* commit 'f099ee6ae4cc4f2d66a1c31f4cd2a908d0e02082':
  Fix issue where unlock handlers are not properly updated
 2014-08-15 17:25:11 +00:00
Brian Carlstrom
cc55b21884 am 0f1a985e: am 04996e70: am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 
* commit '0f1a985e9c1979c1e9187806eacc6fb562700166':
  Disable verification based on vold.decrypt. [frameworks/base]
 2014-08-15 17:22:42 +00:00
Brian Carlstrom
0c32d01e23 am 04996e70: am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 
* commit '04996e701e9ca7a46c79bc7b62cd4588089249df':
  Disable verification based on vold.decrypt. [frameworks/base]
 2014-08-15 17:16:23 +00:00
Brian Carlstrom
d38905b785 am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 
* commit '7fca8e30e91f893a2831e63c1a47a86baf2c56b8':
  Disable verification based on vold.decrypt. [frameworks/base]
 2014-08-15 17:10:46 +00:00
John Spurlock
f77f85ef3a am c51ac1dc: am e1cc245d: am 0ac3062e: Zen: Downtime now a condition provider, persist conditions. 
* commit 'c51ac1dcfe2c7391b333c442389c13a02c073064':
  Zen: Downtime now a condition provider, persist conditions.
 2014-08-15 15:28:16 +00:00
John Spurlock
d0903d4720 am e1cc245d: am 0ac3062e: Zen: Downtime now a condition provider, persist conditions. 
* commit 'e1cc245d9699160988ead4673d6d03e4438c872f':
  Zen: Downtime now a condition provider, persist conditions.
 2014-08-15 15:21:54 +00:00
John Spurlock
2a5c373615 am 0ac3062e: Zen: Downtime now a condition provider, persist conditions. 
* commit '0ac3062ed9aab98c26e669a91a0c3893a440b734':
  Zen: Downtime now a condition provider, persist conditions.
 2014-08-15 15:16:19 +00:00
John Spurlock
4db0d98b42 Zen: Downtime now a condition provider, persist conditions. 
- Persist the entire exit condition instead of only the id.
- Make downtime a proper condition provider (similar to the
  existing countdown provider for time-based conditions)
- Move all downtime-related items out of ZenModeHelper and
  into the new condition provider.
- Reevaluate downtime more often, when any of its inputs change.
- Make sure downtime appears as an available condition in the
  condition panel when applicable.

Bug:16296125
Bug:16211189
Bug:17031767
Change-Id: I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
 2014-08-15 15:06:15 +00:00
Adrian Roos
d7519ef372 am 2b376e36: am 2ebf43ef: am 5a7b75c0: Remove setManagingTrust workaround 
* commit '2b376e36fccb5d816bf71a14c683461b86781386':
  Remove setManagingTrust workaround
 2014-08-15 14:50:47 +00:00
Zoltan Szatmary-Ban
d7d06fed40 am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 
* commit 'bcdd58c572a81477a14c8a670739066783492bc3':
  Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
 2014-08-15 14:44:23 +00:00
Adrian Roos
fb1d427d6a am 2ebf43ef: am 5a7b75c0: Remove setManagingTrust workaround 
* commit '2ebf43eff902cd80b4efa269d086eaa5b3fe3920':
  Remove setManagingTrust workaround
 2014-08-15 14:44:04 +00:00
Zoltan Szatmary-Ban
b828e094c1 am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 
* commit 'e21dd3463a82b82195d09f12d998a7f716c47c91':
  Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
 2014-08-15 14:39:51 +00:00
Adrian Roos
49d9653ee4 am 5a7b75c0: Remove setManagingTrust workaround 
* commit '5a7b75c0c02f22b97e871f32b21470629e84ce9a':
  Remove setManagingTrust workaround
 2014-08-15 14:35:38 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround 
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
 2014-08-15 14:29:55 +00:00
Zoltan Szatmary-Ban
207029f122 am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 
* commit '3e941c339229396864196730c4b069cc437c6ad0':
  Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
 2014-08-15 14:13:49 +00:00
Narayan Kamath
a223cd8d1d am 07d033e9: am 5fb6ef85: am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev 
* commit '07d033e91b824417da9a605f8d0fabdb1d167b67':
  Remove system_server classes from the boot image.
 2014-08-15 13:40:39 +00:00
Zoltan Szatmary-Ban
7db442e2bd am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 
* commit '08390bf9cb75bfb2987a480166d02f672afa8ba1':
  Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
 2014-08-15 13:40:33 +00:00
Narayan Kamath
a93fb72f85 am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 
* commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3':
  Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
 2014-08-15 13:40:22 +00:00
Calin Juravle
1982323f65 am a3c567a7: resolved conflicts for merge of 32db2c97 to lmp-dev-plus-aosp 
* commit 'a3c567a7f32c91b6ea7f46d331340a1722063fdf':
  Integrate NativeActivity with NativeBridge interfaces
 2014-08-15 13:40:17 +00:00
Narayan Kamath
359f9b2aed am 63dba36f: am c7636754: am a6b01d21: Merge "Validate instruction sets passed to installd." into lmp-dev 
* commit '63dba36fe46b4ae6faed9dc6757cba7eda8ade9c':
  Validate instruction sets passed to installd.
 2014-08-15 13:40:12 +00:00
Zoltan Szatmary-Ban
55083f240b am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 13:39:57 +00:00
Jeff Sharkey
6a41d5a6f2 am 0bd1a64a: am 9c5fc77d: am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev 
* commit '0bd1a64a8cfb8e789d650575b07f24b43f19945b':
  Some networks may have null ifaces, I guess?
 2014-08-15 13:39:12 +00:00
Justin Mattson
ca921a8fa4 am e2679634: am 1f1f7e65: am 48734f62: Merge "Tweak leanback form style" into lmp-dev 
* commit 'e2679634f4e4f27601095aa86738843e654ebded':
  Tweak leanback form style
 2014-08-15 13:38:53 +00:00
Jim Miller
78cbe091f1 am b15ca196: am 378f4bc4: am b69c0de3: Merge changes I77f49fe8,I305e927a into lmp-dev 
* commit 'b15ca196fb61b2eab7f85105cad1aeb7fd08e5d4':
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
 2014-08-15 13:38:34 +00:00
Alan Viverette
ef732659fe am 735ad46a: am db31926c: am d264eeda: Merge "Fix TextView clickable state when using onClick attribute" into lmp-dev 
* commit '735ad46adffcbd11f37e87b0fa867f05bc240ae8':
  Fix TextView clickable state when using onClick attribute
 2014-08-15 13:38:14 +00:00
Chet Haase
7c06e5535f am f54e8568: am 3d6c62cb: am 6da8d4a6: Merge "ActionBarOverlay needs to be focusable" into lmp-dev 
* commit 'f54e856877d3c3e7aed723dccd468b0c516ffc4e':
  ActionBarOverlay needs to be focusable
 2014-08-15 13:38:06 +00:00
Amit Mahajan
f20bb1959b am 30108441: am e7eb8925: am 94819cff: Merge "Contribute roaming configuration for domestic roaming and non-roaming cases" into lmp-dev 
* commit '301084411c3ea1cf2b19bfae3a8b5eee6f29768e':
  Contribute roaming configuration for domestic roaming and non-roaming cases
 2014-08-15 13:37:59 +00:00
Narayan Kamath
2737c914f7 am 5fb6ef85: am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev 
* commit '5fb6ef85d5700ab1ceef6459d2b28da618b54717':
  Remove system_server classes from the boot image.
 2014-08-15 13:17:17 +00:00
Calin Juravle
2da6da4938 am a3748052: Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev 
* commit 'a37480520161a7bb0f40320d99a87327aadd95d5':
  Integrate NativeActivity with NativeBridge interfaces
 2014-08-15 13:16:55 +00:00
Narayan Kamath
fa91979fbf am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev 
* commit '09e5ce88ff55ee3421924760137bc8ea2fcda968':
  Remove system_server classes from the boot image.
 2014-08-15 13:12:37 +00:00
Zoltan Szatmary-Ban
eb92dd23b9 am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 
* commit '1d128a5aa11224eb6640a066c7e36225bc3613dd':
  Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
 2014-08-15 13:08:25 +00:00
Zoltan Szatmary-Ban
68692b0657 am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 
* commit '856e0928cf989876678e9af5d62a29b871d7eed3':
  Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
 2014-08-15 13:04:50 +00:00
Narayan Kamath
bab1a3f396 am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 
* commit '09f669f02217b7335f0589812ee0761dbbc28e96':
  Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
 2014-08-15 12:42:42 +00:00
Narayan Kamath
c89b1f0a42 am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 
* commit 'a7d930a070e53b4306034eab7ba315642f2591a4':
  Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
 2014-08-15 12:38:41 +00:00
Calin Juravle
6e0d80bac5 resolved conflicts for merge of 32db2c97 to lmp-dev-plus-aosp 
Change-Id: I3337fdd1ed0fcc5022f98629aea59a97aa6dff28
 2014-08-15 13:33:03 +01:00
Narayan Kamath
40af6aa444 am c7636754: am a6b01d21: Merge "Validate instruction sets passed to installd." into lmp-dev 
* commit 'c7636754eb86afaf463b2f7719f204744c0ac7be':
  Validate instruction sets passed to installd.
 2014-08-15 12:08:13 +00:00
Zoltan Szatmary-Ban
45bdce5df5 am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit 'fe2114b45fd75ef9dd630a696ebd1a3971d06082':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 12:08:08 +00:00
Narayan Kamath
0d2e545235 am a6b01d21: Merge "Validate instruction sets passed to installd." into lmp-dev 
* commit 'a6b01d21fa64df6283734e8f5e1aa41edcfff912':
  Validate instruction sets passed to installd.
 2014-08-15 12:03:51 +00:00
Zoltan Szatmary-Ban
197a72a709 am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit '19c8ce291e89a9ef1442a20e1feab421b11536d7':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 12:03:47 +00:00
Zoltan Szatmary-Ban
1e7bc0def8 Revert "Revert "Update Trusted Credentials screen in settings"" 
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
 2014-08-15 12:55:35 +01:00
Jeff Sharkey
30f5639cb7 am 9c5fc77d: am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev 
* commit '9c5fc77decaaec349a9f64486fb203eceb4549aa':
  Some networks may have null ifaces, I guess?
 2014-08-15 11:50:18 +00:00
Justin Mattson
704cad4cf5 am 1f1f7e65: am 48734f62: Merge "Tweak leanback form style" into lmp-dev 
* commit '1f1f7e65f856154768439e643d01935bed5bb597':
  Tweak leanback form style
 2014-08-15 11:49:43 +00:00
Jim Miller
a3864a79f8 am 378f4bc4: am b69c0de3: Merge changes I77f49fe8,I305e927a into lmp-dev 
* commit '378f4bc4dd0945d6876159ad6fa7c9909261200a':
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
 2014-08-15 11:49:05 +00:00
Alan Viverette
baa61eeef2 am db31926c: am d264eeda: Merge "Fix TextView clickable state when using onClick attribute" into lmp-dev 
* commit 'db31926c2256a25de317c76597493d617797bb55':
  Fix TextView clickable state when using onClick attribute
 2014-08-15 11:48:44 +00:00
Chet Haase
1470d8f0ae am 3d6c62cb: am 6da8d4a6: Merge "ActionBarOverlay needs to be focusable" into lmp-dev 
* commit '3d6c62cb5157a8353b197d8d3d42c50e027b83c6':
  ActionBarOverlay needs to be focusable
 2014-08-15 11:48:08 +00:00