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

Commit e7e5cffa 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

Change-Id: I9247d88b41f98da214bbcba62e40f9c8947b8d5e
parents bc144618 93ae640c

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