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

Merge "Add provisioning extra to keep screen on"

Browse Source
This commit is contained in:
Antoan Angelov
2022-01-19 12:22:22 +00:00
committed by Android (Google) Code Review
parent 08d0c47646 d2958fd83c
commit 9c74d73471
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -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";

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

@@ -2884,6 +2884,20 @@ public class DevicePolicyManager {
public static final String EXTRA_PROVISIONING_RETURN_BEFORE_POLICY_COMPLIANCE =
"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