From 8a410f7e4907ea6c75675eca3bdf1d9d466c2903 Mon Sep 17 00:00:00 2001
From: Stanislav Zholnin <zholnin@google.com>
Date: Fri, 29 May 2020 15:55:28 +0000
Subject: [PATCH] Revert "Revert "Call noteOperation() in ShellDelegate so that
 noteOp() really passes.""

This reverts commit 623bbef1d40c917e723e1240a96d42059bfb3ec8.

Reason for revert: The original change was correct.

Bug: 153676562
Test: presubmit

Change-Id: I4413dfab9704546e8a7a8c6b1955f23b8f73cc32
---
 .../java/com/android/server/am/ActivityManagerService.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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