Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bd23b3b authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

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

am: 057a81d0

* commit '057a81d0':
  Updating user restrictions when they are removed

Change-Id: I7d97675cdcda56ee14c43c2fa1755a29e4c6361a
parents 87410b21 057a81d0

services/core/java/com/android/server/AppOpsService.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }