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

Change-Id: I4b36190d00c8ef244709bed96235ddd1423efd7f
2020-05-29 18:12:27 +00:00
parent 32a8e378e4 664ef14581
commit e10088fbea
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -20224,8 +20224,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);