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

Merge "Javadoc changes for additional DPC-settable extras" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-19 09:38:28 +00:00
committed by Android (Google) Code Review
parent 5fc0e28f2e 4bb56865a5
commit 34a0dd0d91
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -679,8 +679,9 @@ public class DevicePolicyManager {
* A String extra holding the time zone {@link android.app.AlarmManager} that the device * A String extra holding the time zone {@link android.app.AlarmManager} that the device
* will be set to. * will be set to.
* *
* <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner * <p>Use only for device owner provisioning. This extra can be returned by the admin app when
* provisioning via an NFC bump. * performing the admin-integrated provisioning flow as a result of the {@link
* #ACTION_GET_PROVISIONING_MODE} activity.
*/ */
public static final String EXTRA_PROVISIONING_TIME_ZONE public static final String EXTRA_PROVISIONING_TIME_ZONE
= "android.app.extra.PROVISIONING_TIME_ZONE"; = "android.app.extra.PROVISIONING_TIME_ZONE";
@@ -689,8 +690,9 @@ public class DevicePolicyManager {
* A Long extra holding the wall clock time (in milliseconds) to be set on the device's * A Long extra holding the wall clock time (in milliseconds) to be set on the device's
* {@link android.app.AlarmManager}. * {@link android.app.AlarmManager}.
* *
* <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner * <p>Use only for device owner provisioning. This extra can be returned by the admin app when
* provisioning via an NFC bump. * performing the admin-integrated provisioning flow as a result of the {@link
* #ACTION_GET_PROVISIONING_MODE} activity.
*/ */
public static final String EXTRA_PROVISIONING_LOCAL_TIME public static final String EXTRA_PROVISIONING_LOCAL_TIME
= "android.app.extra.PROVISIONING_LOCAL_TIME"; = "android.app.extra.PROVISIONING_LOCAL_TIME";
@@ -699,8 +701,9 @@ public class DevicePolicyManager {
* A String extra holding the {@link java.util.Locale} that the device will be set to. * A String extra holding the {@link java.util.Locale} that the device will be set to.
* Format: xx_yy, where xx is the language code, and yy the country code. * Format: xx_yy, where xx is the language code, and yy the country code.
* *
* <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner * <p>Use only for device owner provisioning. This extra can be returned by the admin app when
* provisioning via an NFC bump. * performing the admin-integrated provisioning flow as a result of the {@link
* #ACTION_GET_PROVISIONING_MODE} activity.
*/ */
public static final String EXTRA_PROVISIONING_LOCALE public static final String EXTRA_PROVISIONING_LOCALE
= "android.app.extra.PROVISIONING_LOCALE"; = "android.app.extra.PROVISIONING_LOCALE";
@@ -996,7 +999,10 @@ public class DevicePolicyManager {
* The default for this extra is {@code false} - by default, the admin of a fully-managed * The default for this extra is {@code false} - by default, the admin of a fully-managed
* device has the ability to grant sensors-related permissions. * device has the ability to grant sensors-related permissions.
* *
* <p>Use only for device owner provisioning. * <p>Use only for device owner provisioning. This extra 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.
*
* @see #ACTION_GET_PROVISIONING_MODE * @see #ACTION_GET_PROVISIONING_MODE
*/ */
public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT = public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT =
@@ -1065,6 +1071,9 @@ public class DevicePolicyManager {
* *
* <p>From {@link android.os.Build.VERSION_CODES#N} onwards, this is also supported for an * <p>From {@link android.os.Build.VERSION_CODES#N} onwards, this is also supported for an
* intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE}. * intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE}.
*
* <p>This extra can also 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_SKIP_ENCRYPTION = public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION =
"android.app.extra.PROVISIONING_SKIP_ENCRYPTION"; "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
@@ -1104,8 +1113,9 @@ public class DevicePolicyManager {
* *
* <p> Maximum 3 key-value pairs can be specified. The rest will be ignored. * <p> Maximum 3 key-value pairs can be specified. The rest will be ignored.
* *
* <p> Use in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE} or * <p> Can be used in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE}. This
* {@link #ACTION_PROVISION_MANAGED_DEVICE} * extra can also 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_DISCLAIMERS = public static final String EXTRA_PROVISIONING_DISCLAIMERS =
"android.app.extra.PROVISIONING_DISCLAIMERS"; "android.app.extra.PROVISIONING_DISCLAIMERS";