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

Commit e360a735 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Introduce hidden constant EXTRA_PROVISIONING_USE_MOBILE_DATA" into pi-dev am: caec3f0a 

am: e15af7df

Change-Id: Idf2a4e0838a1493c943504452000cc54d20e46d6
parents 67952b4c e15af7df

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

+15 −1
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_WIFI_PAC_URL}, optional</li>

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

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

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

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

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

     *

     * @hide

     */
@@ -1020,6 +1021,19 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT =

            "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";



    /**

     * 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.

     *

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

     * provisioning via an NFC bump.

     *

     * @hide

     */

    public static final String EXTRA_PROVISIONING_USE_MOBILE_DATA =

            "android.app.extra.PROVISIONING_USE_MOBILE_DATA";



    /**

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

     *