Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add the provisioning extra admin extras bundle." into lmp-dev

Browse Source
This commit is contained in:
Sander Alewijnse
2014-09-03 11:43:41 +00:00
committed by Android (Google) Code Review
parent 851377f90c 90f14bf53e
commit 52c0f04cbc
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -5482,6 +5482,7 @@ package android.app.admin {
field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0
field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";
field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN";
field public static final java.lang.String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.ADMIN_EXTRA_BUNDLE";
field public static final java.lang.String EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME = "android.app.extra.DEFAULT_MANAGED_PROFILE_NAME";
field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.DEVICE_ADMIN_PACKAGE_CHECKSUM";
field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";

12
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -114,6 +114,18 @@ public class DevicePolicyManager {
public static final String ACTION_PROVISION_MANAGED_PROFILE
= "android.app.action.ACTION_PROVISION_MANAGED_PROFILE";
/**
* A {@link Parcelable} extra of type {@link PersistableBundle} that allows a mobile device
* management application that starts managed profile provisioning to pass data to itself on the
* managed profile when provisioning completes. The mobile device management application sends
* this extra in an intent with the action {@link #ACTION_PROVISION_MANAGED_PROFILE} and
* receives it in {@link DeviceAdminReceiver#onProfileProvisioningComplete} via an intent with
* the action {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}. The bundle is
* not changed during the managed profile provisioning.
*/
public static final String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE =
"android.app.extra.ADMIN_EXTRA_BUNDLE";
/**
* A String extra holding the package name of the mobile device management application that
* will be set as the profile owner or device owner.