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

Commit bd063524 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 am: 323816fc am: 1c5d09a7

Change-Id: I2b3ead08930c716c7f167e244aa995ab377f172a
parents e7474b30 1c5d09a7

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