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

Commit e061a790 authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
Browse files

Merge "Add EXTRA_PROVISIONING_SKIP_USER_CONSENT"

parents fd97505f 51d84f92

api/current.txt

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

    field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    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_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";

    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
@@ -6366,6 +6366,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";

    field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    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_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";

    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/test-current.txt

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

    field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    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_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";

    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

+11 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>

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

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

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

     * </ul>

     *

     * <p>When managed provisioning has completed, broadcasts are sent to the application specified
@@ -811,6 +812,16 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_SKIP_USER_SETUP =

            "android.app.extra.PROVISIONING_SKIP_USER_SETUP";



    /**

     * A boolean extra indicating if the user consent steps from the provisioning flow should be

     * skipped. If unspecified, defaults to {@code false}.

     *

     * It can only be used by an existing device owner trying to create a managed profile via

     * {@link #ACTION_PROVISION_MANAGED_PROFILE}. Otherwise it is ignored.

     */

    public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT =

            "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";



    /**

     * This MIME type is used for starting the device owner provisioning.

     *