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

Commit a9afe9f5 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: 93ae640c am: e7e5cffa am: 2091e8e9

Change-Id: I2bc54dcac63fadb9e163f78a8487138b4f8642bb
parents 36cd7ab1 2091e8e9

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

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