Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115f6abe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Javadoc changes for additional DPC-settable extras" into sc-v2-dev am: 34a0dd0d am: 3e7d377c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16197801

Change-Id: I945a962df2d69fe73dfcf9ed248f6748b053792d
parents a8cc837e 3e7d377c

core/java/android/app/admin/DevicePolicyManager.java

+19 −9
Original line number Diff line number Diff line
@@ -684,8 +684,9 @@ public class DevicePolicyManager { 
     * A String extra holding the time zone {@link android.app.AlarmManager} that the device

     * will be set to.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * <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.

     */

    public static final String EXTRA_PROVISIONING_TIME_ZONE

        = "android.app.extra.PROVISIONING_TIME_ZONE";
@@ -694,8 +695,9 @@ public class DevicePolicyManager { 
     * A Long extra holding the wall clock time (in milliseconds) to be set on the device's

     * {@link android.app.AlarmManager}.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * <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.

     */

    public static final String EXTRA_PROVISIONING_LOCAL_TIME

        = "android.app.extra.PROVISIONING_LOCAL_TIME";
@@ -704,8 +706,9 @@ public class DevicePolicyManager { 
     * 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.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.

     * <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.

     */

    public static final String EXTRA_PROVISIONING_LOCALE

        = "android.app.extra.PROVISIONING_LOCALE";
@@ -1001,7 +1004,10 @@ public class DevicePolicyManager { 
     * 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.

     *

     * <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

     */

    public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT =
@@ -1070,6 +1076,9 @@ public class DevicePolicyManager { 
     *

     * <p>From {@link android.os.Build.VERSION_CODES#N} onwards, this is also supported for an

     * 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 =

             "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
@@ -1109,8 +1118,9 @@ public class DevicePolicyManager { 
     *

     * <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

     * {@link #ACTION_PROVISION_MANAGED_DEVICE}

     * <p> Can be used in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE}. 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_DISCLAIMERS =

            "android.app.extra.PROVISIONING_DISCLAIMERS";