diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-09 11:55:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-09 11:55:26 +0000 |
| commit | caec3f0acb1033464b24475ad50a3a97b41d008f (patch) | |
| tree | 41bf2b7f20b0e64fe65063153790270fc6e26d9c /core/java/android | |
| parent | 0ebc883b2c6c94555d0078c1d79abe9a576d3480 (diff) | |
| parent | eca99a0ae1f5578f30e75d215418049bc39181dd (diff) | |
Merge "Introduce hidden constant EXTRA_PROVISIONING_USE_MOBILE_DATA" into pi-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 16 |
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. |