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

Commit d425960b authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I9d8f2b7b3cc198bd1a937aa064fb9a5afd762006
parents 1e2f119b 28354e54

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