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

Commit 0608b837 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3744695, 3744848, 3744901, 3744902, 3744830, 3744696] into pi-release 

Change-Id: I9182908ea821ce093d846918c039a301eda59392
parents 1c1c8554 2b4b74b4

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

+2 −1
Original line number Diff line number Diff line
@@ -1346,8 +1346,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
                return;

            }

            if (!client.mStartedOps.remove(op)) {

                throw new IllegalStateException("Operation not started: uid" + op.uid

                Slog.wtf(TAG, "Operation not started: uid" + op.uid

                        + " pkg=" + op.packageName + " op=" + op.op);

                return;

            }

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

            if (op.nesting <= 0) {