summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2023-01-04 08:21:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-04 08:21:45 +0000
commitd88da6ddfe64e8bdde8802a68c9200aa7ee870f8 (patch)
tree70ae2fdbf6bbe592c158e13299697a75f6d39e9c
parente7498c23b58d8f6c9a318134f0e1d8d590e9fb54 (diff)
parentfa1075eabdfc2c80d21ac2ae4ab432888707c08c (diff)
Merge "Dynamic broadcast receivers that are not exported need to be filtered in checkBroadcastFromSystem" am: 9446299a5a am: fa1075eabd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2361142 Change-Id: I7b7303a1e0692e964e03ce37887b9061e71fd031 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 47ead69dc5be..a59f0a36a306 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13540,7 +13540,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
} else {
BroadcastFilter bf = (BroadcastFilter)target;
- if (bf.requiredPermission == null) {
+ if (bf.exported && bf.requiredPermission == null) {
allProtected = false;
break;
}