summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Chau <alexchau@google.com> 2018-04-30 17:51:56 +0100
committer Alex Chau <alexchau@google.com> 2018-05-08 20:42:15 +0100
commiteca99a0ae1f5578f30e75d215418049bc39181dd (patch)
tree8b5b42f9f79a2d2b08a529f315bc497a18e2a159
parentac10be860f922039169c8e6655f0816568fc8b25 (diff)
Introduce hidden constant EXTRA_PROVISIONING_USE_MOBILE_DATA
- EXTRA_PROVISIONING_USE_MOBILE_DATA is to indicate mobile data should be used for device owner provisioning - This constant is hidden as API for P is already frozen. The constant hardcoded by developers in a QR code or NFC payload, which should work in P regardless if the constant is hidden. - Our team will be responsible of communicating this new extra to developers desposite it's not appearing in public javadoc Bug: 78594515 Test: None Change-Id: I06000cf9156ef54adc3c8fe12fdb3fa73075a859
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 2feb459bcbdb..08e2c916c53a 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -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
*/
@@ -1021,6 +1022,19 @@ public class DevicePolicyManager {
"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.
*
* <p>During device owner provisioning a device admin app is set as the owner of the device.