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

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

Merge "Call noteOperation() in ShellDelegate so that noteOp() really passes." into rvc-dev

parents c023f447 799ee345

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -20045,8 +20045,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            if (uid == mTargetUid && isTargetOp(code)) {

                final long identity = Binder.clearCallingIdentity();

                try {

                    return mAppOpsService.noteProxyOperation(code, Process.SHELL_UID,

                            "com.android.shell", null, uid, packageName, featureId,

                    return superImpl.apply(code, Process.SHELL_UID, "com.android.shell", featureId,

                            shouldCollectAsyncNotedOp, message);

                } finally {

                    Binder.restoreCallingIdentity(identity);