commit d88da6ddfe64e8bdde8802a68c9200aa7ee870f8
author Sudheer Shanka <sudheersai@google.com> Wed Jan 04 08:21:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 04 08:21:45 2023 +0000
tree 70ae2fdbf6bbe592c158e13299697a75f6d39e9c
parent e7498c23b58d8f6c9a318134f0e1d8d590e9fb54
parent fa1075eabdfc2c80d21ac2ae4ab432888707c08c

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>

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 47ead69..a59f0a3 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 @@
                     }
                 } else {
                     BroadcastFilter bf = (BroadcastFilter)target;
-                    if (bf.requiredPermission == null) {
+                    if (bf.exported && bf.requiredPermission == null) {
                         allProtected = false;
                         break;
                     }