summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElis Elliott <eliselliott@google.com>2022-06-20 17:10:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-06-20 17:10:01 +0000
commit2dc5f6e9f5f00c11eb5b82438033f146032e007b (patch)
tree22029b99b81bc295b43067eab877903d23f67706
parent512a4fe71569d874def5d77bfc1e8dabfd65e423 (diff)
parentd38bf5adac36e478aeadb5ffaaec51eb5c633057 (diff)
downloadbase-2dc5f6e9f5f00c11eb5b82438033f146032e007b.tar.gz
Merge "Update the docs for the provisioning extra AllowOffline." into tm-dev
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 0e1a5461840e..34c91c360dbe 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -770,6 +770,10 @@ public class DevicePolicyManager {
* <p>If this extra is set to {@code true}, the provisioning flow will still try to connect to
* the internet, but if it fails it will start the offline provisioning flow.
*
+ * <p>For T if this extra is set to {@code true}, the provisioning flow will be forced through
+ * the platform and there will be no attempt to download and install the device policy
+ * management role holder.
+ *
* <p>The default value is {@code false}.
*
* <p>This extra is respected when provided via the provisioning intent actions such as {@link