commit 91626be2210ac21ccaffa7ab71f61b192a96daf3
author Svetoslav <svetoslavganov@google.com> Thu Sep 03 04:35:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 04:35:19 2015 +0000
tree 343c8f31638ef0cec476fb5a5d7cabd529f8f6ba
parent e3f920252e30d7601be5b03c4417b0acbfdf6420
parent fbc66e9d51f213a3b80c35fd2430eb01c10c46b0

am fbc66e9d: am 42e3c369: am dc436aaa: am 69228600: am fb9ec507: Incorrect app op check in broadcast queue

* commit 'fbc66e9d51f213a3b80c35fd2430eb01c10c46b0':
  Incorrect app op check in broadcast queue

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

diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index a956c56..960cbf1 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -509,7 +509,7 @@
                     break;
                 }
                 int appOp = AppOpsManager.permissionToOpCode(requiredPermission);
-                if (appOp != r.appOp
+                if (appOp != AppOpsManager.OP_NONE && appOp != r.appOp
                         && mService.mAppOpsService.noteOperation(appOp,
                         filter.receiverList.uid, filter.packageName)
                         != AppOpsManager.MODE_ALLOWED) {