commit 49aa5e4a1f57167da43c5625721541d0b9b5f4ad
author Michael Groover <mpgroover@google.com> Mon Apr 18 14:45:55 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 18 14:45:55 2022 +0000
tree 71d7b814236c178867d42248ca745b9525499bf2
parent 7d250655964a5ea4ff488cd287a3f68496e9d5b7
parent 4c93a26911382dde1089d50ed46b5dc00f4f7fc4

Merge "Revert "Revert "Only allow root/system UIDs to send broadcast to unexported receiver""" into tm-dev

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 3ba99a8..dd7fb84 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -879,9 +879,9 @@
 
         // Ensure that broadcasts are only sent to other apps if they are explicitly marked as
         // exported, or are System level broadcasts
-        if (!skip && !filter.exported && !Process.isCoreUid(r.callingUid)
-                && filter.receiverList.uid != r.callingUid) {
-
+        if (!skip && !filter.exported && mService.checkComponentPermission(null, r.callingPid,
+                r.callingUid, filter.receiverList.uid, filter.exported)
+                != PackageManager.PERMISSION_GRANTED) {
             Slog.w(TAG, "Exported Denial: sending "
                     + r.intent.toString()
                     + ", action: " + r.intent.getAction()