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

Commit 0de354d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp()... 

Merge "Revert "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes.""" into rvc-dev am: 664ef145 am: e498bbb3

Change-Id: I1e41523c6adda4af30c33d57c679b48e5ec913c1
parents 7473fd1f e498bbb3

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

+1 −2
Original line number Diff line number Diff line
@@ -20224,8 +20224,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);