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

Commit 6603cc40 authored by Pietro Maggi's avatar Pietro Maggi Committed by Automerger Merge Worker
Browse files

Merge "Docs: Updating NFC and QR provisioning information" into tm-dev am:... 

Merge "Docs: Updating NFC and QR provisioning information" into tm-dev am: 5ebf0a56 am: bfc6364c am: b8f0a2b5 am: 448a0175

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



Change-Id: I5a1f1c1294d3a72171bb924d282a5647f1899d07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60f50baa 448a0175

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

+22 −13
Original line number Diff line number Diff line
@@ -1145,6 +1145,9 @@ public class DevicePolicyManager { 
     * <p>Use only for device owner provisioning. This extra can be returned by the admin app when

     * performing the admin-integrated provisioning flow as a result of the {@link

     * #ACTION_GET_PROVISIONING_MODE} activity.

     *

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

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_TIME_ZONE

        = "android.app.extra.PROVISIONING_TIME_ZONE";
@@ -1156,6 +1159,9 @@ public class DevicePolicyManager { 
     * <p>Use only for device owner provisioning. This extra can be returned by the admin app when

     * performing the admin-integrated provisioning flow as a result of the {@link

     * #ACTION_GET_PROVISIONING_MODE} activity.

     *

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

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_LOCAL_TIME

        = "android.app.extra.PROVISIONING_LOCAL_TIME";
@@ -1167,6 +1173,9 @@ public class DevicePolicyManager { 
     * <p>Use only for device owner provisioning. This extra can be returned by the admin app when

     * performing the admin-integrated provisioning flow as a result of the {@link

     * #ACTION_GET_PROVISIONING_MODE} activity.

     *

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

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_LOCALE

        = "android.app.extra.PROVISIONING_LOCALE";
@@ -1176,7 +1185,7 @@ public class DevicePolicyManager { 
     * owner provisioning for downloading the mobile device management application.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_SSID

        = "android.app.extra.PROVISIONING_WIFI_SSID";
@@ -1186,7 +1195,7 @@ public class DevicePolicyManager { 
     * is hidden or not.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_HIDDEN

        = "android.app.extra.PROVISIONING_WIFI_HIDDEN";
@@ -1197,7 +1206,7 @@ public class DevicePolicyManager { 
     * {@code WEP} or {@code EAP}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE

        = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";
@@ -1207,7 +1216,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PASSWORD =

            "android.app.extra.PROVISIONING_WIFI_PASSWORD";
@@ -1298,7 +1307,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_HOST

        = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";
@@ -1308,7 +1317,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_PORT

        = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";
@@ -1318,7 +1327,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS

        = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";
@@ -1328,7 +1337,7 @@ public class DevicePolicyManager { 
     * {@link #EXTRA_PROVISIONING_WIFI_SSID}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PAC_URL

        = "android.app.extra.PROVISIONING_WIFI_PAC_URL";
@@ -1338,7 +1347,7 @@ public class DevicePolicyManager { 
     * package. When not provided it is assumed that the device admin package is already installed.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";
@@ -1418,7 +1427,7 @@ public class DevicePolicyManager { 
     * installed package is less than this version code.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE";
@@ -1428,7 +1437,7 @@ public class DevicePolicyManager { 
     * url specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";
@@ -1443,7 +1452,7 @@ public class DevicePolicyManager { 
     * be asked to factory reset the device.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     *

     * <p><strong>Note:</strong> for devices running {@link android.os.Build.VERSION_CODES#LOLLIPOP}

     * and {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1} only SHA-1 hash is supported.
@@ -1489,7 +1498,7 @@ public class DevicePolicyManager { 
     * the user will be asked to factory reset the device.

     *

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

     * provisioning via an NFC bump.

     * provisioning via an NFC bump. It can also be used for QR code provisioning.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM";