Merge "Updating user restrictions when they are removed" into nyc-dev

2016-05-25 03:11:47 +00:00
parent edebcae978 64e0dcb989
commit 1893c4cea7
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -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);
            }
        }
    }