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

Commit a9ec70ba authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Add skip encryption constants for device owner provisioning. 

Bug: 19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
parent d26b16cb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5486,6 +5486,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_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";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5587,6 +5587,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_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";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL";

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

+12 −1
Original line number Diff line number Diff line
@@ -331,6 +331,16 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";



    /**

     * A boolean extra indicating whether device encryption is required as part of Device Owner

     * provisioning.

     *

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

     * provisioning via an NFC bump.

     */

    public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION =

             "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";



    /**

     * This MIME type is used for starting the Device Owner provisioning.

     *
@@ -361,7 +371,8 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_HOST}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_PORT} (convert to String), optional</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_BYPASS}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PAC_URL}, optional</li></ul>

     * <li>{@link #EXTRA_PROVISIONING_WIFI_PAC_URL}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}, optional</li></ul>

     *

     * <p> When device owner provisioning has completed, an intent of the type

     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcasted to the