Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9cb6a493: Merge "Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions" into mnc-dev

Browse Source 
* commit '9cb6a493f4e8bd9914f2841355b3293f90773802':
  Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions
This commit is contained in:
Benjamin Franz
2015-06-18 06:33:02 +00:00
committed by Android Git Automerger
parent 157ccceff4 9cb6a493f4
commit b953af556e
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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_SMS);
DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FUN); DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FUN);
DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SAFE_BOOT); 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 // The following user restrictions cannot be changed by any active admin, including device