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

Commit 198fb394 authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Add EXTRA_PROVISIONING_ALLOW_OFFLINE"

parents 53aa02dd d3a5461b

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7554,6 +7554,7 @@ package android.app.admin { 
    field public static final String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE";

    field public static final String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE";

    field public static final String EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES = "android.app.extra.PROVISIONING_ALLOWED_PROVISIONING_MODES";

    field public static final String EXTRA_PROVISIONING_ALLOW_OFFLINE = "android.app.extra.PROVISIONING_ALLOW_OFFLINE";

    field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME";

    field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE";

    field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";

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

+26 −0
Original line number Diff line number Diff line
@@ -621,6 +621,32 @@ public class DevicePolicyManager { 
    public static final String EXTRA_FORCE_UPDATE_ROLE_HOLDER =

            "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";













    /**













     * A boolean extra indicating whether offline provisioning is allowed.













     *













     * <p>For the online provisioning flow, there will be an attempt to download and install













     * the latest version of the device management role holder. The platform will then delegate













     * provisioning to the device management role holder via role holder-specific provisioning













     * actions.













     *













     * <p>For the offline provisioning flow, the provisioning flow will always be handled by













     * the platform.













     *













     * <p>If this extra is set to {@code false}, the provisioning flow will enforce that an













     * internet connection is established, which will start the online provisioning flow. If an













     * internet connection cannot be established, provisioning will fail.













     *













     * <p>If this extra is set to {@code true}, the provisioning flow will still try to connect to













     * the internet, but if it fails it will start the offline provisioning flow.













     *













     * <p>The default value is {@code false}.













     *













     * <p>This extra is respected when provided via the provisioning intent actions such as {@link













     * #ACTION_PROVISION_MANAGED_PROFILE}.













     */













    public static final String EXTRA_PROVISIONING_ALLOW_OFFLINE =













            "android.app.extra.PROVISIONING_ALLOW_OFFLINE";



























    /**















     * Action: Bugreport sharing with device owner has been accepted by the user.















     *