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

Commit 2cd6ce5e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't throw but wtf to help chase mismatched start/finish op calls" into pi-dev

parents 613783a9 31d83ae5

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

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

                return;

            }

            }

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

            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);

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

                return;

            }

            }

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

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

            if (op.nesting <= 0) {

            if (op.nesting <= 0) {