summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2014-05-27 18:22:35 +0100
committerNicolas Prévot <nprevot@google.com>2014-06-03 17:07:34 +0000
commit3742ec394f2603af465dcaa5909916b1065243c3 (patch)
tree732205ed1a0959352b6523f7531ddfcf74a06aec /core/java
parentc777185688d1de4f1c989b3f7630e7715fd71be3 (diff)
downloadframeworks_base-3742ec394f2603af465dcaa5909916b1065243c3.zip
frameworks_base-3742ec394f2603af465dcaa5909916b1065243c3.tar.gz
frameworks_base-3742ec394f2603af465dcaa5909916b1065243c3.tar.bz2
Adding user consent extras to DevicePolicyManager.
Adding ACTION_PROVISIONING_USER_HAS_CONSENTED and EXTRA_PROVISIONING_TOKEN to DevicePolicyManager. They can be used to tell ManagedProvisioning to skip user consent. Change-Id: I5ef8ab2a14969bb29a2ee3dbdce5ca3225e0759a
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java18
1 files changed, 18 insertions, 0 deletions
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}