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

Commit bc80a260 authored by Craig Lafayette's avatar Craig Lafayette Committed by Android (Google) Code Review
Browse files

Merge "Add factory reset protection extras to DPM."

parents cff70cd8 8e27c4dd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5712,6 +5712,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";

    field public static final java.lang.String EXTRA_PROVISIONING_RESET_PROTECTION_PARAMETERS = "android.app.extra.PROVISIONING_RESET_PROTECTION_PARAMETERS";

    field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5818,6 +5818,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";

    field public static final java.lang.String EXTRA_PROVISIONING_RESET_PROTECTION_PARAMETERS = "android.app.extra.PROVISIONING_RESET_PROTECTION_PARAMETERS";

    field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

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

+14 −0
Original line number Diff line number Diff line
@@ -502,6 +502,20 @@ public class DevicePolicyManager { 
     */

    public static final String EXTRA_PROVISIONING_BT_USE_PROXY

            = "android.app.extra.PROVISIONING_BT_USE_PROXY";



    /**

     * A {@link android.os.Parcelable} extra of type {@link android.os.PersistableBundle} that

     * holds data needed by the system to wipe factory reset protection. The data needed to wipe

     * the device depend on the installed factory reset protection implementation. For example,

     * if an account is needed to unlock a device, this extra may contain data used to

     * authenticate that account.

     *

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

     * provisioning via an NFC bump.

     */

    public static final String EXTRA_PROVISIONING_RESET_PROTECTION_PARAMETERS

            = "android.app.extra.PROVISIONING_RESET_PROTECTION_PARAMETERS";



    /**

     * This MIME type is used for starting the Device Owner provisioning that does not require

     * provisioning features introduced in Android API level