Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,737 Commits 3 Branches 0 Tags
99db87c1ba5ddca1d00945dc97b53370574835f2
Commit Graph

43254 Commits

Author SHA1 Message Date
Adam Lesinski
99db87c1ba am afe71dba: am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit 'afe71dba4adb8ad8d07146a1d17211875b42c012':
  Fix assumption about DynamicRefTable in aapt
 2014-08-16 00:44:04 +00:00
Sunny Goyal
c340783a50 am b42afabc: am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit 'b42afabcaf88857acbffc88458278393192a164b':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-16 00:43:53 +00:00
Christopher Tate
c71107b170 am a2f65fd4: am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit 'a2f65fd48d0c018fb2891d6e983472f7bd747f81':
  Tighten restore-at-install behavior
 2014-08-16 00:43:48 +00:00
Amith Yamasani
f4146ab007 am 9d579953: am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev 
* commit '9d579953a8b9704f8c43775991be83df7df91b2b':
  Copy certain settings to the managed profile
 2014-08-16 00:43:23 +00:00
Julia Reynolds
34b5930fc3 resolved conflicts for merge of 9ef71fb5 to master 
Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2
 2014-08-15 20:26:42 -04:00
Adam Lesinski
ab9b1f5b2a am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
  Fix assumption about DynamicRefTable in aapt
 2014-08-15 22:07:59 +00:00
Sunny Goyal
a4dd2c336f am 6ba6c6ce: am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 
* commit '6ba6c6cecbfe58295c07d6c793aebbc3d9ea2ec2':
  Returning null when preview image is not available for AppWidgetProviderInfo
 2014-08-15 21:47:45 +00:00
Christopher Tate
a981cfba7b am 5e6afbc2: am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev 
* commit '5e6afbc2c5dafec254601ac3968a8c26219c91be':
  Tighten restore-at-install behavior
 2014-08-15 21:47:40 +00:00
Adam Lesinski
91348eb957 Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 2014-08-15 21:23:40 +00:00
Christopher Tate
6cbc07b7c0 Merge "Tighten restore-at-install behavior" into lmp-dev 2014-08-15 21:23:40 +00:00
Amith Yamasani
38992b95e8 am e52fb6f4: am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev 
* commit 'e52fb6f4df210523946fbc041207438d8264472c':
  Copy certain settings to the managed profile
 2014-08-15 21:17:26 +00:00
Julia Reynolds
cdf03e4c1c am 289bbb2d: am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev 
* commit '289bbb2d827e73893a201f2ecde04f19c86bfc5f':
  Apply lockdowns when user restrictions are set.
 2014-08-15 21:17:05 +00:00
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
Adam Lesinski
2cb761e3dd Fix assumption about DynamicRefTable in aapt 
Packages without any resources should not expect to have
a DynamicRefTable.

Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
 2014-08-15 14:01:43 -07: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
Amith Yamasani
d97a0e7281 Merge "Copy certain settings to the managed profile" into lmp-dev 2014-08-15 19:14:43 +00:00
Amith Yamasani
4f7e2e334e Copy certain settings to the managed profile 
All reads of those specific settings will go to the primary user.
Inserts to primary also go to managed profiles in order to notify
any observers.

This enables Location settings to be shared by both profiles.
Also some other settings related to IME and Accessibility since
those services are shared across the profiles.

Bug: 16457210
Change-Id: Ib8fd697b5c78027fcbaf245d82dda5e6d6aab4f0
 2014-08-15 13:42:21 -07:00
Julia Reynolds
d438deffad Merge "Apply lockdowns when user restrictions are set." into lmp-dev 2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9 Apply lockdowns when user restrictions are set. 
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.

Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
 2014-08-15 16:16:38 -04:00
Sunny Goyal
336eaae177 Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev 2014-08-15 18:45:09 +00:00
Sunny Goyal
092e196274 Returning null when preview image is not available for AppWidgetProviderInfo 
The default application icon generally has a different aspect ratio that a
preview image, and cannot transparently be  used in place of the image.
Returning null will allow the apps to handle the case as they see fit.

Change-Id: Ie6e8e16dd7b4e58b222187a81c62d27eccab45a9
 2014-08-15 13:02:59 -07:00
Christopher Tate
a63246d6da Tighten restore-at-install behavior 
Harden the guarantee that if we're asked about a possible restore,
we always ALWAYS report back to the package manager.  This involved
closing "should never happen" edge cases around provisioning/auto-restore
setting that nevertheless were happening.

Also, on the auto-restore setting front, make sure to plumb that
system API through appropriately, since going behind its back and
manipulating the secure setting directly would cause things to get
out of step.

Bug 17060654

Change-Id: I52ca9c1ffbfc0bd6b57196157500d0868bfc2989
 2014-08-15 11:22:01 -07: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
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
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
65c09b10ca Remove setManagingTrust workaround 
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
 2014-08-15 14:29:55 +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
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
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
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
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
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
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
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
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