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

Change-Id: I989ac2930aaad4be6ef59c83e40105f451a4246e
2020-04-23 01:02:18 +00:00
parent bd1ad2453d a87a494ff8
commit ad34ccb648
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
@@ -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);