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

Commit 7f79ed14 authored by Bruno Martins's avatar Bruno Martins Committed by android-build-merger
Browse files

Merge "AppOpsService: Watch op mode changes when an AppOp restriction dies" am: a96bafd7 

am: 061fda06

Change-Id: Ib5046d46850b37808b2bd262e739b69c811a601b
parents 22e57478 061fda06

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

+6 −1
Original line number Diff line number Diff line
@@ -705,7 +705,12 @@ public class AppOpsService extends IAppOpsService.Stub { 
        public void binderDied() {

            synchronized (AppOpsService.this) {

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

                    finishOperationLocked(mStartedOps.get(i), /*finishNested*/ true);

                    final Op op = mStartedOps.get(i);

                    finishOperationLocked(op, /*finishNested*/ true);

                    if (op.startNesting <= 0) {

                        scheduleOpActiveChangedIfNeededLocked(op.op, op.uidState.uid,

                                op.packageName, false);

                    }

                }

                mClients.remove(mAppToken);

            }