summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Svetoslav <svetoslavganov@google.com> 2015-09-01 23:01:53 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-01 23:01:53 +0000
commit42e3c3696d7c5a6ee6ec4c9fd37289d6e917577a (patch)
tree2c8fd39fd871ce22648d585ed9af3c1199f71be2
parente2565aecca1c56dcf80bb0e88dfddeca25388ad6 (diff)
parentdc436aaaf2f00ddb0faf70ff6dfb8368c8a589f7 (diff)
am dc436aaa: am 69228600: am fb9ec507: Incorrect app op check in broadcast queue
* commit 'dc436aaaf2f00ddb0faf70ff6dfb8368c8a589f7': Incorrect app op check in broadcast queue
-rw-r--r--services/core/java/com/android/server/am/BroadcastQueue.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index a956c564f9ee..960cbf15a96e 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 @@ public final class BroadcastQueue {
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) {