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

Browse Source 
Change-Id: I4b36190d00c8ef244709bed96235ddd1423efd7f
This commit is contained in:
TreeHugger Robot
2020-05-29 18:12:27 +00:00
committed by Automerger Merge Worker
parent 32a8e378e4 664ef14581
commit e10088fbea
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)) { if (uid == mTargetUid && isTargetOp(code)) {
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
try { try {
return mAppOpsService.noteProxyOperation(code, Process.SHELL_UID, return superImpl.apply(code, Process.SHELL_UID, "com.android.shell", featureId,
"com.android.shell", null, uid, packageName, featureId,
shouldCollectAsyncNotedOp, message); shouldCollectAsyncNotedOp, message);
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);