Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I1e41523c6adda4af30c33d57c679b48e5ec913c1
This commit is contained in:
TreeHugger Robot
2020-05-29 18:15:17 +00:00
committed by Automerger Merge Worker
parent 7473fd1f4e e498bbb34e
commit 0de354d16e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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