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

Commit 82504ee0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5e433b9fbccd81b8caf02832e79a05ac85083232
parents 7b9650de ad34ccb6

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

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