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

Commit d4f4fd03 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Use checkOperation in BroadcastQueue."

parents 9440af5c 7bb3cd8d

services/java/com/android/server/am/BroadcastQueue.java

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ public final class BroadcastQueue { 
            }

        }

        if (r.appOp != AppOpsManager.OP_NONE) {

            int mode = mService.mAppOpsService.noteOperation(r.appOp,

            int mode = mService.mAppOpsService.checkOperation(r.appOp,

                    filter.receiverList.uid, filter.packageName);

            if (mode != AppOpsManager.MODE_ALLOWED) {

                if (DEBUG_BROADCAST)  Slog.v(TAG,
@@ -777,7 +777,7 @@ public final class BroadcastQueue { 
                }

            }

            if (r.appOp != AppOpsManager.OP_NONE) {

                int mode = mService.mAppOpsService.noteOperation(r.appOp,

                int mode = mService.mAppOpsService.checkOperation(r.appOp,

                        info.activityInfo.applicationInfo.uid, info.activityInfo.packageName);

                if (mode != AppOpsManager.MODE_ALLOWED) {

                    if (DEBUG_BROADCAST)  Slog.v(TAG,