Commit Graph

39561 Commits

Author SHA1 Message Date
Jeff Davidson
f206ab9db3 am 8450fe3b: am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev
* commit '8450fe3b1ce69a24e373ebca6302739103f1c03b':
  Fix default scorer provisioning.
2014-08-15 22:08:11 +00: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
Jeff Davidson
cab3eb0c0b Merge "Fix default scorer provisioning." into lmp-dev 2014-08-15 21:23: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
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
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
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
fb1d427d6a am 2ebf43ef: am 5a7b75c0: Remove setManagingTrust workaround
* commit '2ebf43eff902cd80b4efa269d086eaa5b3fe3920':
  Remove setManagingTrust workaround
2014-08-15 14:44:04 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
2014-08-15 14:29:55 +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
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
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
George Mount
c3b821494d am dd29ffc5: am fe8529f1: Don\'t blink in views that haven\'t transitioned yet.
* commit 'dd29ffc5593eea0c829d5ec7d773f140bd0662e8':
  Don't blink in views that haven't transitioned yet.
2014-08-15 11:35:35 +00:00
Adam Powell
9e6e6e4496 am f38fb34a: am 7622c178: Merge "Show checkmarks at the start of material AlertDialog list items" into lmp-dev
* commit 'f38fb34adb4b5929e611aadf0c6bb43e5acdb4ac':
  Show checkmarks at the start of material AlertDialog list items
2014-08-15 11:35:22 +00:00
Alan Viverette
602683909b am 54e70a6e: am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration()
* commit '54e70a6e81deab85c3f875eee57bc30b35c34dcf':
  Deprecate InputMethodService.enableHardwareAcceleration()
2014-08-15 11:34:59 +00:00
Anish Athalye
dd4308f5e7 am 675f13bf: am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev
* commit '675f13bfa8abcc439af1218e9de4d834e9253ede':
  Make LeadingMarginSpan2 behavior more consistent
2014-08-15 11:34:47 +00:00
Fabrice Di Meglio
6652b30039 am b73577a9: am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered
* commit 'b73577a925e4acd930aea25bae17a04352d09bc3':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
2014-08-15 11:33:14 +00:00
Andres Morales
e6b63e6c6f Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 2014-08-15 08:11:59 +00:00
Andres Morales
f9a97942e1 Fix issue where unlock handlers are not properly updated
If an unlock handler already exists, we need to try
to update the tech mask for it. Don't permit unlock
handlers with no tech mask.

Bug: 17054331
Change-Id: I54a885d28bdd8ce41d8646d968621c7d6abc9387
2014-08-15 17:08:24 +00:00
Narayan Kamath
2b3b706e14 Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
3480ab45c8 Fix getPackageInfo for the "android" package in the system server.
bug: 16555230
Change-Id: I90ebf9b35fda8246b0079f67b1469f96c3b4ede2
2014-08-15 18:14:44 +01:00
Narayan Kamath
29564cd245 Remove system_server classes from the boot image.
We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
  class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
  classes.jar. They are only used from there, and since they
  use Class.forName, we want them to be loaded by the
  system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
  used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
2014-08-15 13:37:03 +01:00
Narayan Kamath
6c4b9de8f1 Validate instruction sets passed to installd.
We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
2014-08-15 12:50:10 +01:00
Jose Lima
7f7b3f37d1 am 9d52ec9f: am bd2f1793: Make TranslucentConversionListener a SystemApi
* commit '9d52ec9fee722ecb84994faa2c48822b8e3879ba':
  Make TranslucentConversionListener a SystemApi
2014-08-15 03:55:59 +00:00
Jeff Davidson
56f9f73a5a Fix default scorer provisioning.
Use Settings.Global instead of SharedPreferences (which don't work) to
track whether we've run the one-time provisioning step of activating
the build-time configured default scorer.

Bug: 16980605
Change-Id: I093cdd6f4f1110960078a186191c4e02b5543d6a
2014-08-14 16:47:23 -07:00
Torne (Richard Coles)
128dc15fee am 6d9b1fc8: am ca6c7cb1: Merge "Store the WebView\'s package info." into lmp-dev
* commit '6d9b1fc81bdf8e4da3c2872ed1523b576ab3d64f':
  Store the WebView's package info.
2014-08-14 23:35:02 +00:00
Jeff Sharkey
3758534bbf am dae9bc1f: am 67ec007c: Fix javadoc on PROTECTION_FLAG_APPOP.
* commit 'dae9bc1f3a5833a6bdd4bd6de7142d063aad9d8a':
  Fix javadoc on PROTECTION_FLAG_APPOP.
2014-08-14 23:34:54 +00:00
Doug Zongker
e2e18a3484 am a9c87471: am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev
* commit 'a9c874719b05430458ed523138a4a46aa0901bff':
  @hide RECOVERY permission
2014-08-14 23:34:38 +00:00
Jorim Jaggi
8f188d32b0 am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade
* commit 'ddf03adb2e4150168dfe6e27338ca18e264f5f8d':
  Use different unlock animation when going to full shade
2014-08-14 23:34:08 +00:00
George Mount
a2bbbb3bac Don't blink in views that haven't transitioned yet.
Bug 16959262

Views that hadn't animated in during the enter transition were
being stripped from the exit transition. This caused them to
blink in as the enter transition was canceled.

This pauses the entering transition so that the view positions
are properly captured for the exit transition and aren't stripped.

Change-Id: I39cc94ed3bf92a51f8c5fe741f0aa5456b704bf0
2014-08-14 20:19:41 +00:00
Alan Viverette
e07b595519 Deprecate InputMethodService.enableHardwareAcceleration()
BUG: 16951553
Change-Id: I126ea823eb2eeabb29d30999dec9c9411b33b315
2014-08-14 20:06:02 +00:00
Anish Athalye
4798c44563 Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 2014-08-14 19:49:28 +00:00
Anish Athalye
ab08c6d38a Make LeadingMarginSpan2 behavior more consistent
This addresses b/16486549.

This change updates public documentation to specify the behavior of
LeadingMarginSpan2s. This change specifies what happens when a
LeadingMarginSpan2 is combined with other LeadingMarginSpans. This
behavior was not previously documented.

LeadingMarginSpan2s specify the number of lines used for the leading
margin. When laying out and rendering, for all LeadingMarginSpans, the
first line margin is applied for the number of lines specified by the
LeadingMarginSpan2.

Previously, this behavior was slightly buggy -- the LeadingMarginSpan2
affected all LeadingMarginSpans when laying out text, but not when
rendering.

This change is designed to cause the least amount of breakage in
existing code while achieving consistency with the way
LeadingMarginSpan2 is handled in layout and drawing.

For the most common use of LeadingMarginSpan2 -- getting a multi-line
first margin in the first paragraph of text in a layout -- this should
cause no change in behavior. For any other uses, the old (buggy)
implementation most likely did not exhibit correct behavior to begin
with, so developers were most likely not relying on that functionality.

Change-Id: I6f69df09c0130e703458e65bf3eaac4a905df56e
2014-08-14 11:58:37 -07:00
Prerepa Viswanadham
b8035fda5d am 66e02987: am d58dee86: Protect from malformed advt with invalid manf_id/data combo
* commit '66e02987b45cb9d04c6bca790dcb3da612e81529':
  Protect from malformed advt with invalid manf_id/data combo
2014-08-14 18:02:58 +00:00