Commit Graph

4389 Commits

Author SHA1 Message Date
Amith Yamasani
7511526792 resolved conflicts for merge of 83726dfc to master
Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98
2014-08-20 08:41:02 -07:00
Selim Cinek
522cb106dc am 65dbc328: am 53006cab: am cc19946d: Added notification color to all system notifications
* commit '65dbc32814ed265a0c1adcd4100f80029402ef40':
  Added notification color to all system notifications
2014-08-20 13:59:14 +00:00
Selim Cinek
255dd04271 Added notification color to all system notifications
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Amith Yamasani
609aaca4d8 Merge "Rename restrictions API class and method" into lmp-dev 2014-08-19 22:53:25 +00:00
Amith Yamasani
d1d7c022c6 Rename restrictions API class and method
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission

Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
2014-08-19 17:03:41 -07:00
Adam Lesinski
cad5c64fff am 1ed46f56: am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
* commit '1ed46f56df69f8e4749efbb407b2d81c2972ca9f':
  Add Shell command to set AppOps permissions
2014-08-19 21:19:35 +00:00
Jon Miranda
b98d40939d am 998d6e02: am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev
* commit '998d6e0267a2e2a242e0fff1049f5366f0f5e5c4':
  Exposes style and theme data, adds developer option.
2014-08-19 03:20:40 +00:00
Adam Lesinski
b5cf61be7c Add Shell command to set AppOps permissions
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
2014-08-19 11:27:19 -07:00
arete
86ba1a8f68 am d522aabb: am d4f0067e: am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev
* commit 'd522aabbe6e781e4c52535c0d037c7c52516c4a1':
  Expose system apis for backup transport migration
2014-08-19 00:01:49 +00:00
Adam Powell
63e8664e6a am 0eca798b: am 9c7cf696: am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev
* commit '0eca798bc6f6a5a3bc81485ae57b50e5976a95a9':
  Fix a bug propagating navigation button events from ToolbarActionBar
2014-08-18 23:45:30 +00:00
arete
4220a9a9f6 Merge "Expose system apis for backup transport migration" into lmp-dev 2014-08-18 23:27:42 +00:00
Jon Miranda
611f8f17f3 Merge "Exposes style and theme data, adds developer option." into lmp-dev 2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94 Exposes style and theme data, adds developer option.
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
2014-08-18 18:32:53 -07:00
Adam Powell
8f4a21e466 Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Powell
14e1afe0d8 Fix a bug propagating navigation button events from ToolbarActionBar
Add a simple internal wrapper for dealing with window callback events.
This should also make working with things like action modes from
ToolbarActionBar significantly easier in later changes.

Bug 16980711

Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
2014-08-18 15:58:23 -07:00
arete
ff31addb9b Expose system apis for backup transport migration
Bug: 16542048
Change-Id: I45e710028316e7b2dc4195700a1e7344afb54691
2014-08-18 20:34:43 +00:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Dianne Hackborn
6b8dba383a am 93109322: am 4a0bc3cc: am 2dff9254: Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." into lmp-dev
* commit '93109322f71099a78a9c597a8d74f27110e669af':
  Fix issue #14617210: Apps can gain access to any ContentProvider...
2014-08-18 19:42:02 +00:00
Craig Stout
e7daa311df am 37e35094: am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev
* commit '37e3509452ed789d57165f7929c3f9d648c49eb0':
  Fix alert, date picker, time picker dialogs for TV.
2014-08-18 19:41:16 +00:00
Jason Monk
45c3597975 resolved conflicts for merge of 8e6b5343 to master
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
2014-08-18 11:05:17 -04:00
Craig Stout
26bcdf14cf Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 2014-08-16 04:03:42 +00:00
Craig Stout
fd4bc4cdca Fix alert, date picker, time picker dialogs for TV.
b/15194230

Change-Id: I85bcef86332acb041e5c3b1f8c515d981486c3d1
2014-08-15 20:56:14 -07:00
Dianne Hackborn
028ceeb472 Fix issue #14617210: Apps can gain access to any ContentProvider...
...with grantUriPermissions (no user interaction required)

Add a new path in to the activity manager to start an activity as
if it was directy started by the original calling activity.  This
is specifically for the resolver activity and chooser activity to
be able to safely launch its data after serving as an intermediary.

Access to the new method is highly restricted -- it can only be
called by an activity that is declared in the framework apk itself,
and the execute-as-the-caller behavior will only happen if the
code is running under the system uid.  (This means we could still
have these run in the client's process in some cases and still work
correctly.)

Note there is some commented out code here half-done about trying
to propagate security exceptions back to the original calling
activity.  This would be really nice, especially now with the
chooser activity running in a system process so any errors made
by the app (bad permission grants, bad intents, etc) no longer
actually appear in the app so are essentially invisible.  I'd
really like to figure out a way to propagate these exceptions back
to the app, but this is hard since the app's process may no
longer even be running at this point.

Also tweak activity manager dump output to split the recents
dump out from activities, since recents can now be super large.

Change-Id: I50410c4783faf9302c69290589a068a846e0973a
2014-08-18 11:35:12 -07:00
Alan Viverette
d7cb8dae66 am 926b8ebd: am 95495581: am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
* commit '926b8ebdd8e02d59d306449494eb00218d550c9a':
  Fix date and time picker styling
2014-08-16 03:34:11 +00:00
Jeff Sharkey
00eb0dc691 am 870e1f60: am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
* commit '870e1f6039b00a4878a01c59e8b407571f6361ba':
  PackageInstaller API refactoring.
2014-08-16 00:44:50 +00:00
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
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
Alan Viverette
aeda0586f3 Merge "Fix date and time picker styling" 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
Alan Viverette
518ff0de95 Fix date and time picker styling
Removes done buttons from widgets, fixes date picker day selection, fixes
dialog layouts in landscape, updates colors. Adds API on AlertDialog for
setting the view by resource ID, which is necessary to correctly inflate
the view against the dialog's parent view.

BUG: 16941550
BUG: 16852521
BUG: 16878697
BUG: 16838659
BUG: 17047435
Change-Id: I138858ce06cd4abf68a2c3361ec170370236b33b
2014-08-15 14:20:35 -07: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
Jeff Sharkey
3e3b251f46 Merge "PackageInstaller API refactoring." into lmp-dev 2014-08-15 18:56:10 +00:00
Jeff Sharkey
a0907436c0 PackageInstaller API refactoring.
Switch to using IntentSender for results to give installers easier
lifecycle management.  Move param and info objects to inner classes.

Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
2014-08-15 15:57:02 -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
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
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
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
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
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
George Mount
f8a9c1fa90 am 0409affc: am dd29ffc5: am fe8529f1: Don\'t blink in views that haven\'t transitioned yet.
* commit '0409affc27a829f806f4f11be61344aa0c3b3ab1':
  Don't blink in views that haven't transitioned yet.
2014-08-15 11:44:17 +00:00
Jose Lima
c41e939e94 am 18b3ce23: am 9d52ec9f: am bd2f1793: Make TranslucentConversionListener a SystemApi
* commit '18b3ce239f7e51dc999bc695a4b4ce0b8c53e48f':
  Make TranslucentConversionListener a SystemApi
2014-08-15 05:06:37 +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
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
Jose Lima
698dcf6b77 am 438d6300: am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager
* commit '438d630058336fb5afed72db34e75cf4898298a8':
  Made AlarmClockInfo a nested class in AlarmManager
2014-08-14 17:56:59 +00:00
Jose Lima
9c9e325980 am ed60a1e1: am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind"
* commit 'ed60a1e131918adba2777a577ebabd9866728d57':
  Renamed "media playing" APIs to "visible behind"
2014-08-14 17:56:47 +00:00