Merge "Introduce hidden constant EXTRA_PROVISIONING_USE_MOBILE_DATA" into pi-dev
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 2feb459..08e2c91 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -341,7 +341,8 @@
* <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 @@
"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.