commit fa1075eabdfc2c80d21ac2ae4ab432888707c08c
author Sudheer Shanka <sudheersai@google.com> Wed Jan 04 07:03:52 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 04 07:03:52 2023 +0000
tree ecce24aae8a401173b37d3de8a6555bd8fb0762d
parent a34428066a8b9917cad8c8b42c3a1272b4328c97
parent 9446299a5a4233b69ae0ebc978b97038c16abefc

Merge "Dynamic broadcast receivers that are not exported need to be filtered in checkBroadcastFromSystem" am: 9446299a5a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2361142

Change-Id: Ide4210ee931b813528552ffd26ccb7f3a72bed1b
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 75e30e5..6bd036b 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13529,7 +13529,7 @@
                     }
                 } else {
                     BroadcastFilter bf = (BroadcastFilter)target;
-                    if (bf.requiredPermission == null) {
+                    if (bf.exported && bf.requiredPermission == null) {
                         allProtected = false;
                         break;
                     }