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

Commit 664ef145 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
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
parents d32418a7 8a410f7e

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