diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-06-17 16:13:31 +0100 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2015-06-17 16:13:31 +0100 |
| commit | 1046ba518b07e42eb5d3474f1ff9ca1181c331d5 (patch) | |
| tree | e1c8b6cc9871a8140b532e2df0c2c07612525bd1 /services/devicepolicy/java/com/android | |
| parent | 2cc03e5606ad7cd473283898400506d5ac2237ba (diff) | |
| download | frameworks_base-1046ba518b07e42eb5d3474f1ff9ca1181c331d5.zip frameworks_base-1046ba518b07e42eb5d3474f1ff9ca1181c331d5.tar.gz frameworks_base-1046ba518b07e42eb5d3474f1ff9ca1181c331d5.tar.bz2 | |
Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions
Even though the documentation of DISALLOW_CREATE_WINDOWS says it is for
Device Owners and Profile Owners on User 0 only, it was previously not
part of DEVICE_OWNER_USER_RESTRICTIONS and was therefore callable from
a profile owner on a managed profile or secondary user.
Bug: 19726884
Change-Id: If6443eacbc28b7ee6c0845754923573a79f8bde3
Diffstat (limited to 'services/devicepolicy/java/com/android')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index f1f61f3..3b62b61 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -211,6 +211,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SMS); DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FUN); DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SAFE_BOOT); + DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_CREATE_WINDOWS); } // The following user restrictions cannot be changed by any active admin, including device |