From 623bbef1d40c917e723e1240a96d42059bfb3ec8 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Fri, 24 Apr 2020 14:19:06 +0000
Subject: [PATCH] Revert "Call noteOperation() in ShellDelegate so that
 noteOp() really passes."

This reverts commit 799ee34558f5ef91efe4e02242dabf5ca4feb463.

Reason for revert: Broke tests in b/154910689

Change-Id: I006fb07dc29bff6f00324ae56099bc0a0a6a23a9
Bug: 154910689
---
 .../java/com/android/server/am/ActivityManagerService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index a22b44225b70c..3fdf541566a55 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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);