diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 24 |
2 files changed, 19 insertions, 6 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 064d998219c2..2e4b4b56c359 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -7707,6 +7707,7 @@ package android.app.admin { field public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION"; field @Deprecated public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT"; field public static final String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE"; + field public static final String EXTRA_PROVISIONING_USE_MOBILE_DATA = "android.app.extra.PROVISIONING_USE_MOBILE_DATA"; field public static final String EXTRA_PROVISIONING_WIFI_ANONYMOUS_IDENTITY = "android.app.extra.PROVISIONING_WIFI_ANONYMOUS_IDENTITY"; field public static final String EXTRA_PROVISIONING_WIFI_CA_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_CA_CERTIFICATE"; field public static final String EXTRA_PROVISIONING_WIFI_DOMAIN = "android.app.extra.PROVISIONING_WIFI_DOMAIN"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7269b0d91d02..88b5377fbb31 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1623,14 +1623,26 @@ public class DevicePolicyManager { "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS"; /** - * 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. + * A boolean extra indicating if mobile data should be used during the provisioning flow + * for downloading the admin app. 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. + * <p>Default value is {@code false}. * - * @hide + * <p>If this extra is set to {@code true} and {@link #EXTRA_PROVISIONING_WIFI_SSID} is not + * specified, this extra has different behaviour depending on the way provisioning is triggered: + * <ul> + * <li> + * For provisioning started via a QR code or an NFC tag, mobile data is always used for + * downloading the admin app. + * </li> + * <li> + * For all other provisioning methods, a mobile data connection check is made at the start + * of provisioning. If mobile data is connected at that point, the admin app download will + * happen using mobile data. If mobile data is not connected at that point, the end-user + * will be asked to pick a wifi network and the admin app download will proceed over wifi. + * </li> + * </ul> */ public static final String EXTRA_PROVISIONING_USE_MOBILE_DATA = "android.app.extra.PROVISIONING_USE_MOBILE_DATA"; |