diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-06-03 17:08:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-03 17:08:50 +0000 |
| commit | 93d8c7259d57c1503b15740ad3b88315466e52ee (patch) | |
| tree | 084de445d4364669e5df864f52daaec3097936aa | |
| parent | 4c9e57f156d3cbd86b38e9897dfdab81964efe90 (diff) | |
| parent | 3742ec394f2603af465dcaa5909916b1065243c3 (diff) | |
| download | frameworks_base-93d8c7259d57c1503b15740ad3b88315466e52ee.zip frameworks_base-93d8c7259d57c1503b15740ad3b88315466e52ee.tar.gz frameworks_base-93d8c7259d57c1503b15740ad3b88315466e52ee.tar.bz2 | |
Merge "Adding user consent extras to DevicePolicyManager."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 5d9d0e6..b5849ed 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5246,6 +5246,7 @@ package android.app.admin { field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN"; field public static final java.lang.String EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME = "defaultManagedProfileName"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "deviceAdminPackageName"; + field public static final java.lang.String EXTRA_PROVISIONING_TOKEN = "android.app.extra.token"; field public static int FLAG_MANAGED_CAN_ACCESS_PARENT; field public static int FLAG_PARENT_CAN_ACCESS_MANAGED; field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b3b1d47..afe2981 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -104,6 +104,17 @@ public class DevicePolicyManager { = "android.app.action.ACTION_PROVISION_MANAGED_PROFILE"; /** + * A broadcast intent with this action can be sent to ManagedProvisionning to specify that the + * user has already consented to the creation of the managed profile. + * The intent must contain the extras + * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME} and + * {@link #EXTRA_PROVISIONING_TOKEN} + * @hide + */ + public static final String ACTION_PROVISIONING_USER_HAS_CONSENTED + = "android.app.action.USER_HAS_CONSENTED"; + + /** * A String extra holding the name of the package of the mobile device management application * that starts the managed provisioning flow. This package will be set as the profile owner. * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE}. @@ -112,6 +123,13 @@ public class DevicePolicyManager { = "deviceAdminPackageName"; /** + * An int extra used to identify the consent of the user to create the managed profile. + * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE} + */ + public static final String EXTRA_PROVISIONING_TOKEN + = "android.app.extra.token"; + + /** * A String extra holding the default name of the profile that is created during managed profile * provisioning. * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE} |