diff options
author | Pietro Maggi <pmaggi@google.com> | 2023-01-06 19:00:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-06 19:00:59 +0000 |
commit | bfc6364c74c49fdd2dd1512b9f49e0cc77fd605c (patch) | |
tree | 5722d069ff984b4aa01e209b3bb29fa5947c8661 | |
parent | 0fb3ef55b848fcc155810258015cb09fecc34e73 (diff) | |
parent | 5ebf0a5685a908d5c93dc44e5e796d588cfdb47b (diff) | |
download | base-bfc6364c74c49fdd2dd1512b9f49e0cc77fd605c.tar.gz |
Merge "Docs: Updating NFC and QR provisioning information" into tm-dev am: 5ebf0a5685
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20881922
Change-Id: I9dfdd6c824006d32793fbfacaa73745ff48e09ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8e09939f6805..4a4ba6371939 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1128,6 +1128,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"; @@ -1139,6 +1142,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"; @@ -1150,6 +1156,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"; @@ -1159,7 +1168,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"; @@ -1169,7 +1178,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"; @@ -1180,7 +1189,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"; @@ -1190,7 +1199,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"; @@ -1281,7 +1290,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"; @@ -1291,7 +1300,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"; @@ -1301,7 +1310,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"; @@ -1311,7 +1320,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"; @@ -1321,7 +1330,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"; @@ -1401,7 +1410,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"; @@ -1411,7 +1420,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"; @@ -1426,7 +1435,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. @@ -1472,7 +1481,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"; |