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

Browse Source 
am: 1893c4cea7

* commit '1893c4cea7825e9f44f08b6165a04fd90c1adf9d':
  Updating user restrictions when they are removed

Change-Id: I07b1d9878dc8517c964277f4507203dcd44ceeee
This commit is contained in:
Suprabh Shukla
2016-05-25 03:14:39 +00:00
committed by android-build-merger
parent 66e5b59d85 1893c4cea7
commit 057a81d0b3
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); Preconditions.checkNotNull(token);
for (int i = 0; i < AppOpsManager._NUM_OP; i++) { for (int i = 0; i < AppOpsManager._NUM_OP; i++) {
String restriction = AppOpsManager.opToRestriction(i); String restriction = AppOpsManager.opToRestriction(i);
if (restriction != null && restrictions.getBoolean(restriction, false)) { if (restriction != null) {
setUserRestrictionNoCheck(i, true, token, userHandle, null); setUserRestrictionNoCheck(i, restrictions.getBoolean(restriction, false), token,
userHandle, null);
} }
} }
} }