diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 1619441b53f3..3234e162e5fa 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -7565,6 +7565,7 @@ package android.app.admin { field @Deprecated public static final String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS"; field public static final String EXTRA_PROVISIONING_IMEI = "android.app.extra.PROVISIONING_IMEI"; field public static final String EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION = "android.app.extra.PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION"; + field public static final String EXTRA_PROVISIONING_KEEP_SCREEN_ON = "android.app.extra.PROVISIONING_KEEP_SCREEN_ON"; field public static final String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED"; field public static final String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE"; field public static final String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 2bfb938e3571..96825933b17c 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2885,6 +2885,20 @@ public class DevicePolicyManager { "android.app.extra.PROVISIONING_RETURN_BEFORE_POLICY_COMPLIANCE"; /** + * A {@code boolean} flag that indicates whether the screen should be on throughout the + * provisioning flow. + * + * <p>The default value is {@code false}. + * + * <p>This extra can either be passed as an extra to the {@link + * #ACTION_PROVISION_MANAGED_PROFILE} intent, or it can be returned by the + * admin app when performing the admin-integrated provisioning flow as a result of the + * {@link #ACTION_GET_PROVISIONING_MODE} activity. + */ + public static final String EXTRA_PROVISIONING_KEEP_SCREEN_ON = + "android.app.extra.PROVISIONING_KEEP_SCREEN_ON"; + + /** * Activity action: Starts the administrator to show policy compliance for the provisioning. * This action is used any time that the administrator has an opportunity to show policy * compliance before the end of setup wizard. This could happen as part of the admin-integrated |