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

Commit f6f6649e authored by Svet Ganov's avatar Svet Ganov Committed by android-build-merger
Browse files

Merge "Don't throw but wtf to help chase mismatched start/finish op calls"... 

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

Change-Id: I4e61dcfd5cd09ece5f9f59666bf335b4eacf77a1
parents 406f2f73 a2ce0e63

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