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

Merge "Updating user restrictions when they are removed" into nyc-dev am: 1893c4cea7 am: 057a81d0b3

Browse Source 
am: 1bd23b3bf1

* commit '1bd23b3bf13aa3f6353321b5af499b937b254405':
  Updating user restrictions when they are removed

Change-Id: Ib4b28cf093a0b051c3addea3c899ac0dc656ba0e
This commit is contained in:
Suprabh Shukla
2016-05-25 03:22:10 +00:00
committed by android-build-merger
parent c6f22d70a9 1bd23b3bf1
commit 4ea450fa49
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/AppOpsService.java
View File

@@ -2180,8 +2180,9 @@ public class AppOpsService extends IAppOpsService.Stub {
Preconditions.checkNotNull(token);
for (int i = 0; i < AppOpsManager._NUM_OP; i++) {
String restriction = AppOpsManager.opToRestriction(i);
if (restriction != null && restrictions.getBoolean(restriction, false)) {
setUserRestrictionNoCheck(i, true, token, userHandle, null);
if (restriction != null) {
setUserRestrictionNoCheck(i, restrictions.getBoolean(restriction, false), token,
userHandle, null);
}
}
}