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

Commit d6a98979 authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Fix resetAllModes call to act only on the calling user 

This makes it consistent with other methods in different services.
Also fixes the Settigns bug referenced below.

Bug: 16727586
Change-Id: I0b8bcb248f621fcfa2cb12163caeec9eb8ff5b1c
parent 2265c8f7

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

+6 −1
Original line number Diff line number Diff line
@@ -437,13 +437,18 @@ public class AppOpsService extends IAppOpsService.Stub { 


    @Override

    public void resetAllModes() {

        int callingUid = Binder.getCallingUid();

        mContext.enforcePermission(android.Manifest.permission.UPDATE_APP_OPS_STATS,

                Binder.getCallingPid(), Binder.getCallingUid(), null);

                Binder.getCallingPid(), callingUid, null);

        HashMap<Callback, ArrayList<Pair<String, Integer>>> callbacks = null;

        synchronized (this) {

            boolean changed = false;

            for (int i=mUidOps.size()-1; i>=0; i--) {

                HashMap<String, Ops> packages = mUidOps.valueAt(i);

                if (UserHandle.getUserId(callingUid) != UserHandle.getUserId(mUidOps.keyAt(i))) {

                    // Skip any ops for a different user

                    continue;

                }

                Iterator<Map.Entry<String, Ops>> it = packages.entrySet().iterator();

                while (it.hasNext()) {

                    Map.Entry<String, Ops> ent = it.next();