Commit Graph

42913 Commits

Author SHA1 Message Date
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
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
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
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
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
Zoltan Szatmary-Ban
2b13c5641a Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 2014-08-15 04:54:19 +00:00
Zoltan Szatmary-Ban
f8d72cc14f Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
2014-08-15 12:58:37 +00:00
Narayan Kamath
f75aadc028 Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
2014-08-15 12:25:52 +00:00
Narayan Kamath
bdc78678de Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 2014-08-15 04:54:19 +00:00
Zoltan Szatmary-Ban
9c7ed91d78 Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 2014-08-15 04:38:54 +00:00
Zoltan Szatmary-Ban
3291de8f6c Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
2014-08-15 14:01:14 +00:00
Narayan Kamath
35cbf0e450 Merge "Remove system_server classes from the boot image." into lmp-dev 2014-08-15 04:32:23 +00: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
5dc4a440d1 Merge "Validate instruction sets passed to installd." into lmp-dev 2014-08-15 04:32:23 +00: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
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
Prerepa Viswanadham
2a2da65137 am 5550c2b1: am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
* commit '5550c2b101541300c8fa52989e4a98949319bd2a':
  Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
2014-08-14 18:02:51 +00:00
Fabrice Di Meglio
b1a50f2dff Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings.
SettingsPreferenceFragment$1@273c8fdb was not registered

- add onUnbindPreferences() call to match onBindPreferences()
- this new method is @hide so it does not impact the APIs

Change-Id: Iee0ab8a4ecc2046f89fb96cc52af150e835f658c
2014-08-14 18:00:11 +00:00
Wei Wang
b54b014dd3 am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev
* commit 'f7dfa984b57be7ed39b07f26cf9c74a2501a62a2':
  Clean up advertise and scan clients upon bluetooth down.
2014-08-14 17:47:41 +00:00
Jose Lima
95f3c34848 am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager
* commit '068045187ef2b6011633b3a0bf273030ecb6d664':
  Made AlarmClockInfo a nested class in AlarmManager
2014-08-14 17:47:08 +00:00
Jose Lima
f082842f2b am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind"
* commit 'b991fd6ec57b0f59e20f85a9cb9c63ac9d0ab98a':
  Renamed "media playing" APIs to "visible behind"
2014-08-14 17:47:02 +00:00
Jeff Brown
d1ee11da70 am f281eea3: am 79bdc4d1: Log who is calling goToSleep().
* commit 'f281eea327ed9020333746cc77e48636662231b6':
  Log who is calling goToSleep().
2014-08-14 17:46:57 +00:00
Dianne Hackborn
ab843022e2 am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev
* commit '0bfe8aea12144bfdcc34673c5b14309f141d4de7':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
2014-08-14 17:46:42 +00:00