From eca99a0ae1f5578f30e75d215418049bc39181dd Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Mon, 30 Apr 2018 17:51:56 +0100
Subject: [PATCH] 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
---
 .../android/app/admin/DevicePolicyManager.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 2feb459bcbdbf..08e2c916c53aa 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
      */
@@ -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.
      *