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

Commit e92b6396 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Make EXTRA_PROVISIONING_USE_MOBILE_DATA public API" into tm-dev am: 9d06c94e 

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

Change-Id: I164ea0adcbb59b700ac1c6b1986b2fc4b90ec68f
parents 70cf236f 9d06c94e

core/api/current.txt

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

    field @Deprecated public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";

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

    field public static final String EXTRA_PROVISIONING_USE_MOBILE_DATA = "android.app.extra.PROVISIONING_USE_MOBILE_DATA";

    field public static final String EXTRA_PROVISIONING_WIFI_ANONYMOUS_IDENTITY = "android.app.extra.PROVISIONING_WIFI_ANONYMOUS_IDENTITY";

    field public static final String EXTRA_PROVISIONING_WIFI_CA_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_CA_CERTIFICATE";

    field public static final String EXTRA_PROVISIONING_WIFI_DOMAIN = "android.app.extra.PROVISIONING_WIFI_DOMAIN";

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

+18 −6
Original line number Diff line number Diff line
@@ -1623,14 +1623,26 @@ public class DevicePolicyManager { 
            "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";















    /**













     * A boolean extra indicating if mobile data should be used during NFC device owner provisioning













     * for downloading the mobile device management application. If {@link













     * #EXTRA_PROVISIONING_WIFI_SSID} is also specified, wifi network will be used instead.













     * A boolean extra indicating if mobile data should be used during the provisioning flow













     * for downloading the admin app. If {@link #EXTRA_PROVISIONING_WIFI_SSID} is also specified,













     * wifi network will be used instead.















     *













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













     * provisioning via an NFC bump.













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















     *













     * @hide













     * <p>If this extra is set to {@code true} and {@link #EXTRA_PROVISIONING_WIFI_SSID} is not













     * specified, this extra has different behaviour depending on the way provisioning is triggered:













     * <ul>













     * <li>













     *     For provisioning started via a QR code or an NFC tag, mobile data is always used for













     *     downloading the admin app.













     * </li>













     * <li>













     *     For all other provisioning methods, a mobile data connection check is made at the start













     *     of provisioning. If mobile data is connected at that point, the admin app download will













     *     happen using mobile data. If mobile data is not connected at that point, the end-user













     *     will be asked to pick a wifi network and the admin app download will proceed over wifi.













     * </li>













     * </ul>















     */















    public static final String EXTRA_PROVISIONING_USE_MOBILE_DATA =















            "android.app.extra.PROVISIONING_USE_MOBILE_DATA";