summaryrefslogtreecommitdiff
path: root/core/java/android/os/UserManager.java
diff options
context:
space:
mode:
authorBenjamin Miller <benjaminmiller@google.com>2017-07-20 13:58:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-20 13:58:15 +0000
commitbaa85250d49e2f6e5deac1270bd17bfaef18dfd1 (patch)
treefe893129d03e525f25c844b6c01da14a9f11a9d6 /core/java/android/os/UserManager.java
parent8e644a7510440a99b5404f9f8e8dc3ebd3816135 (diff)
parentd41a9fc60b53d8ac7ffec15e6b9ad87bd3a18272 (diff)
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Diffstat (limited to 'core/java/android/os/UserManager.java')
-rw-r--r--core/java/android/os/UserManager.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index a7fc2e70171f..79a67fe11554 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -389,10 +389,13 @@ public class UserManager {
public static final String DISALLOW_ADD_MANAGED_PROFILE = "no_add_managed_profile";
/**
- * Specifies if a user is disallowed from disabling application verification.
- * Starting from {@link android.os.Build.VERSION_CODES#O}, application verification
- * is enforced across all users on the device if a profile owner or device owner sets
- * this restriction to <code>true</code>. The default value is <code>false</code>.
+ * Specifies if a user is disallowed from disabling application verification. The default
+ * value is <code>false</code>.
+ *
+ * <p>In Android 8.0 ({@linkplain android.os.Build.VERSION_CODES#O API level 26}) and higher,
+ * this is a global user restriction. If a device owner or profile owner sets this restriction,
+ * the system enforces app verification across all users on the device. Running in earlier
+ * Android versions, this restriction affects only the profile that sets it.
*
* <p>Key for user restrictions.
* <p>Type: Boolean