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

Commit 28354e54 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

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

parents 23f855ea 623bbef1

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

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

                final long identity = Binder.clearCallingIdentity();

                try {

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

                    return mAppOpsService.noteProxyOperation(code, Process.SHELL_UID,

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

                            shouldCollectAsyncNotedOp, message);

                } finally {

                    Binder.restoreCallingIdentity(identity);