commit 70ee03ab68e4fc131dff4fea9d4b5fead1377e8a
author Sudheer Shanka <sudheersai@google.com> Tue Oct 08 13:54:25 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 21 22:41:46 2025 -0700
tree 110f93040d325e0233535b4f761a6257401730bd
parent 54642d141f80d495a475b304052eedd2832fcdb1

Don't allow non-system uids to use "android" as calling package.

Bug: 310632322
Test: atest ./BroadcastsSecurityTest/src/android/app/cts/broadcasts/BroadcastRegistrationTest.java
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e91977c4ebfdfe4e2124373d22f99dfe211a06b)
Merged-In: I3e08f85d8d6c5de119f024a518d499dcd86f6006
Change-Id: I3e08f85d8d6c5de119f024a518d499dcd86f6006

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

diff --git a/services/core/java/com/android/server/am/BroadcastController.java b/services/core/java/com/android/server/am/BroadcastController.java
index 354f281..aa06b7e 100644
--- a/services/core/java/com/android/server/am/BroadcastController.java
+++ b/services/core/java/com/android/server/am/BroadcastController.java
@@ -316,8 +316,7 @@
                 return null;
             }
             if (callerApp.info.uid != SYSTEM_UID
-                    && !callerApp.getPkgList().containsKey(callerPackage)
-                    && !"android".equals(callerPackage)) {
+                    && !callerApp.getPkgList().containsKey(callerPackage)) {
                 throw new SecurityException("Given caller package " + callerPackage
                         + " is not running in process " + callerApp);
             }