diff options
| author | Benjamin Miller <benjaminmiller@google.com> | 2017-07-20 14:05:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 14:05:31 +0000 |
| commit | aeb503f7ca877cd881be9afae86f4e06f5d39608 (patch) | |
| tree | 85bc174d1cecf81f3b1efa66828374d814a69893 /core/java/android | |
| parent | 4757c8ccf83d4391255273529aba8feb9ccd4a21 (diff) | |
| parent | baa85250d49e2f6e5deac1270bd17bfaef18dfd1 (diff) | |
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am: baa85250d4
Change-Id: I553b5b775cbdb42020405dfcc1b18032d4777597
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/UserManager.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 3337def4c4e1..12013fce2fef 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 |