Commit Graph

4063 Commits

Author SHA1 Message Date
John Reck
d907e5b1ef Merge "Fix onTrimMemory for HardwareRenderer" 2014-06-30 22:27:39 +00:00
John Reck
f47a594f52 Fix onTrimMemory for HardwareRenderer
Also fixes detachFunctor possibly drawing after return

 Bug: 15189843
 Bug: 15990672

Change-Id: I64c48cb674c461a8eeaba407b697e09f72c98ce3
2014-06-30 16:36:26 -07:00
Amith Yamasani
aba4f1b54a Add a method to set a profile owner and active admin at once
This can be used by system apps to register a profile owner during setup

Bug: 15922051
Change-Id: Iee1b5adeb47d7e40ab36df18e3a057d8ee430f46
2014-07-01 15:36:12 +05:30
Jeff Brown
8fef877310 Merge "Make MediaSessionToken an inner class of MediaSession." 2014-06-30 22:24:07 +00:00
Jeff Brown
dba34ba35c Make MediaSessionToken an inner class of MediaSession.
Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.

Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
2014-06-30 16:05:25 -07:00
Christopher Tate
51fea57e06 Refactor restore to deal with heterogeneous datasets
Transport-based restore now handles both key/value and full-data
(stream) data delivery.

Also: PMBA now holds metadata for *all* apps, not just those with
backup agents.  Since we need to consult this for every restore-
at-install operation we cache this locally now, tagged per transport
and per remote dataset, to avoid having to re-download it as part
of every future restore operation.

Also fixed a bug in LocalTransport that was preventing restore of
key/value datasets, i.e. all of them that were nominally available
prior to this change.

NOTE: at present there is no automatic full-data backup; if for
testing purposes you need to create some to then use for restore,
you still need to use 'bmgr fullbackup ...' to push them.

NOTE: at present the unified transport restore uses a refactored
"engine" implementation to handle stream data that encapsulates
the existing "adb restore" implementation.  However, the adb
restore code path has not yet been refactored to wrap the newly-
extracted engine version; it still contains its own copy of all
the relevant logic.  This will change in a future CL, at which
point offline/USB archive restore will simply wrap the same
shared stream-restore engine implementation.

Bug 15330073
Bug 15989617

Change-Id: Ieedb18fd7836ad31ba24656ec9feaaf69e164af8
2014-06-30 17:43:05 -07:00
Jessica Hummel
a55fc99201 Merge "Provide api to set the managed profile name." 2014-06-26 21:33:38 +00:00
Jessica Hummel
1333ea1ed7 Provide api to set the managed profile name.
Instead of sending the profile name in the provisioning intent
the mdm should set the profile name after provisioning has completed.
This allows us to simplify the provisioning flow and the mdm can
change the name of the profile later on if required.

Change-Id: I821ef2300eae74e89872152ae1c89ac3ecbb82e7
2014-06-30 12:40:37 +01:00
Craig Mautner
33acfbed07 Restore saved fragment state
DialogFragment was saving the state of the dialog in
onSavedInstanceState() but this was being lost because it was
only being saved in the FragmentState but not being restored
into the Fragment when the Fragment was being reinstantiated.
This left us in a state after a rotation where the
DialogFragment was in the state "showing" but had never been
relaunched. Restoring the saved Bundle to the Fragment causes
the DialogFragment to be relaunched after the rotation.

Fixes bug 15559669.

Change-Id: I953a6c4bfdaed1ebcad1d99f47ceac5e017797db
2014-06-28 14:00:53 -07:00
Sander Alewijnse
420b9f4037 Merge "Add public constants for Device Owner Provisioning." 2014-06-26 21:23:48 +00:00
Sander Alewijnse
1cc4ecc3e2 Add public constants for Device Owner Provisioning.
Change-Id: I46dca4e31ab256273eb810f57083f31541815735
2014-06-30 11:36:42 +01:00
George Mount
8881502da5 Target only the proper views in activity transitions.
Bug 15725361

Change-Id: I0b50aac9323653b6652d6ec638d54ff2d55ba8d5
2014-06-30 11:32:18 -07:00
George Mount
566cbf20cc Merge "Fix activity transitions enter transition." 2014-06-26 18:07:29 +00:00
George Mount
2eb983be20 Merge "Activity Transitions: change default behavior." 2014-06-27 16:52:20 +00:00
George Mount
60625b02ac Fix activity transitions enter transition.
Bug 15851310

Change-Id: I25ccbe4466251eaa0991fc6f25713772871e5f7b
2014-06-24 15:23:28 -07:00
George Mount
abb63cb622 Activity Transitions: change default behavior.
Bug 15746767

The default for activity transitions with the material theme
should be to enable them when makeSceneTransitionAnimation is
used, but disable them when no ActivityOptions is used.

Change-Id: I4c777a72e4401b367e30b9ba971f7280646d5017
2014-06-24 07:01:27 -07:00
George Mount
a0a0260e48 Activity Transitions: Fix memory leak.
Bug 15731459

Change-Id: Id357d841a0db832e2525b7bbd75c8d8ccdb757d1
2014-06-24 06:39:29 -07:00
Alexandra Gherghina
70882cd654 Merge "Expose per-user APIs for content services." 2014-06-24 06:38:28 +00:00
Alexandra Gherghina
0363c3eb08 Expose per-user APIs for content services.
Bug: 15466880
Change-Id: Ib5a030e78559307627fe0d2e80ce6f1a7825109d
2014-06-26 10:47:19 +01:00
Winson Chung
2cb86c7231 Saving last TaskDescription for TaskRecord.
Change-Id: I531e0fc661fdedeb78bee7d5472668de8e9c2104
2014-06-26 12:37:28 -07:00
Adrian Roos
dded065c86 Merge "Trust Agents: Add facility to request credential entry" 2014-06-24 06:38:28 +00:00
Adrian Roos
2c12cfa1d5 Trust Agents: Add facility to request credential entry
Bug: 15871777
Change-Id: I43c80151f6403ff62961aeb3dc7aafe049e18a62
2014-06-25 23:28:53 +02:00
Winson Chung
c286444f14 Merge "Use Task last active time to ensure we don't reload items for the cache." 2014-06-25 17:34:05 +00:00
Winson Chung
f1fbd77cf0 Use Task last active time to ensure we don't reload items for the cache.
Change-Id: I29206de0453f5d7d1370b27a27ef6d3594eff8e7
2014-06-24 18:09:00 -07:00
George Mount
bcd8365197 Merge "Activity Transitions: Don't do a shared element exit transition twice." 2014-06-25 17:34:05 +00:00
George Mount
1677b6b830 Merge "Activity Transitions: Fix memory leak." 2014-06-25 17:34:02 +00:00
George Mount
5770f18e82 Merge "Activity Transitions: don't require transitionName." 2014-06-25 17:34:07 +00:00
George Mount
f451d8a6d1 Activity Transitions: Don't do a shared element exit transition twice.
Bug 15671433

Change-Id: I888702df5661c769cc1c093d859fd85e5e33d282
2014-06-24 06:57:08 -07:00
George Mount
1fecfb2ddc Activity Transitions: don't require transitionName.
Bug 15585623
Bug 15607591

Exit transitions now run because exit transitions are executed
with startActivity.

Change-Id: Ie55793a9514c64d96e2cf1abdd2d39c4d2606a23
2014-06-23 17:06:13 -07:00
Jason Monk
7218e9c6be Merge "The profile owner shouldn't control lock task" 2014-06-24 07:59:24 +00:00
Jason Monk
c5185f2bf1 The profile owner shouldn't control lock task
Since managed profiles are started on bootup, the managed profile
would be allowed to set an app (possibly itself) as a lock task
app and then run itself on bootup and constantly control the
device.  This privelege should be restricted to device owners.

Change-Id: I4a93aabd6054cbe75076ef0517fce03ffa74dc93
2014-06-24 14:12:20 -04:00
Adam Powell
371a809179 Inflate fragments from layout into child FragmentManagers
Previously, if an app inflated a layout in a Fragment's onCreateView
that itself had fragments included, those fragments would be added to
the Activity-level FragmentManager and would not share the same
lifecycle with the fragment it was inflated for. This led to some
nasty management headaches.

If an app targets L or above, add the fragment to the child
FragmentManager of the current fragment when inflated using the
LayoutInflater passed to the parent fragment.

Bug 12763389

Change-Id: Iad4ed7d5df602aea9579bf1503e206fa894630c1
2014-06-24 12:29:32 -07:00
Chris Wren
9856739cb0 am 7d165c5d: Update javadocs for heads up behavior.
* commit '7d165c5d59b6afb6aa66999ff76b79c8017ad09a':
  Update javadocs for heads up behavior.
2014-06-24 10:33:07 +00:00
Chris Wren
47c20a163a Update javadocs for heads up behavior.
The heads up notification is influences by full screen, sound,
vibration and priority. Update the documentation on those APIs to
explain this.

Also add some draft documentation for hidden API surfaces.

Bug: 15509793
Change-Id: Ie7dc99d9c1acf873782bdd010cdf28d11da256d7
2014-06-23 16:48:41 -04:00
George Mount
eeda22b46f Merge "Revert "Revert "API Review: Change View viewName attribute to transitionName.""" 2014-06-21 03:15:09 +00:00
George Mount
0a2ae002e6 Revert "Revert "API Review: Change View viewName attribute to transitionName.""
This reverts commit 1bdfbc68e22a64215ab8fa3e3d17676513546997.

Change-Id: Ie3fdf53b33cb2f61c1878055940f52ed9dfc8b08
2014-06-23 14:57:27 +00:00
John Reck
a3c1025b80 Revert "API Review: Change View viewName attribute to transitionName."
This reverts commit f1b1adf51b2a84e0ac83685812c7e8d86590af12.

Change-Id: I0e49aeed84f2a548e272a59f4e13c3fb74c2bfd9
2014-06-23 14:51:44 +00:00
John Reck
4fb48d24bb Merge "Revert "API Review: Change View viewName attribute to transitionName."" 2014-06-23 14:51:00 +00:00
George Mount
7a73fda47d Merge "API Review: Change View viewName attribute to transitionName." 2014-06-21 03:15:09 +00:00
Nicolas Prevot
88cc346d06 Show the icon of the personal space.
In an intent disambiguation dialog from a managed profile,
when the intent can be forwarded to the personal space:
show the icon of the parent next to "Personal apps".
And put it at the bottom of the dialog.

Change-Id: I523222aac5dde9653e784eb26cf23cdaf018b86c
2014-06-23 12:25:07 +01:00
George Mount
125578a863 API Review: Change View viewName attribute to transitionName.
Bug 15548520

Change-Id: I4009458d83dbffb20ff0100aaa42eea44d943378
2014-06-20 11:01:01 -07:00
Alexandra Gherghina
aeb0ed7467 Merge "Adds cross-profile intent filters for the Settings app" 2014-06-20 04:43:13 +00:00
Jason Monk
858aef2942 Merge "Add lock-to-app mode" 2014-06-20 00:24:32 +00:00
Jason Monk
62515beee6 Add lock-to-app mode
Added a dialog that shows when app has not been authorized by
DevicePolicyManager.isLockTaskAuthorized.  This allows any app
to trigger lock-to-app mode.  This same dialog is used when
startLockTaskOnCurrent is triggered by the recents long-press.

Can exit the mode by long-pressing recents again.

Keyguard is disabled when lock-to-app is active.

This CL also prevents apps from finishing when they are the root
task in a lock task TaskRecord.

Change-Id: Ib54d858e570cccf6bfd986958868e15f49bcef75
2014-06-20 16:17:38 -04:00
Dianne Hackborn
b65ea7bfc6 Fix issue #15689396: pre-installed DemoAPI tests fail...
...with a NPE on emulators running Google x86 API 19 image

Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
2014-06-20 12:18:55 -07:00
George Mount
9285d1bf9c Exclude views that aren't on screen from Activity Transitions.
Bug 15704207

Change-Id: I114a5191536b5c59c6c2d1074fab8505a8ad2fdb
2014-06-20 14:09:57 +00:00
Alexandra Gherghina
6e2ae2590d Adds cross-profile intent filters for the Settings app
Bug: 15466742
Change-Id: Id9af588f2f3d51a562ef2a06fe7404c96123cc2e
2014-06-19 18:04:45 +01:00
Jeff Sharkey
65dfc83cef am b9a45aae: am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit 'b9a45aae8d07e7a92806b53cbc36f5488e3bac2d':
  Fixing parcel leaks to avoid virtual memory leak
2014-06-19 16:17:03 +00:00
Jeff Sharkey
b9a45aae8d am 447b68e7: am b5e05cff: Merge "Fixing parcel leaks to avoid virtual memory leak"
* commit '447b68e767943fdde297d78321378e2623985a0a':
  Fixing parcel leaks to avoid virtual memory leak
2014-06-19 16:11:51 +00:00
Maunik Shah
db1a9a3862 Fixing parcel leaks to avoid virtual memory leak
Client has to call recycle() on parcel object after its usage
otherwise native layer of binder won't clear the resources of
parcel which were allocated for IPC

Change-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e
2014-06-19 19:44:21 +05:30