Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00885035 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow non-system server code to AppOpsManager.checkOp and NoteOp" into... 

Merge "Allow non-system server code to AppOpsManager.checkOp and NoteOp" into rvc-dev am: 0237b4a5 am: 2e0f0f8b am: c4371bfc

Change-Id: I76b4777cb2f50e91e82dacbceaec7f29edc24ff7
parents b5adf996 c4371bfc

services/core/java/com/android/server/appop/AppOpsService.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -2830,7 +2830,6 @@ public class AppOpsService extends IAppOpsService.Stub { 




    private int checkOperationImpl(int code, int uid, String packageName,

    private int checkOperationImpl(int code, int uid, String packageName,

                boolean raw) {

                boolean raw) {

        verifyIncomingUid(uid);

        verifyIncomingOp(code);

        verifyIncomingOp(code);

        String resolvedPackageName = resolvePackageName(uid, packageName);

        String resolvedPackageName = resolvePackageName(uid, packageName);

        if (resolvedPackageName == null) {

        if (resolvedPackageName == null) {