summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author mayankkk <mayankkk@google.com> 2024-12-03 17:36:14 -0800
committer Mayank Dandwani <mayankkk@google.com> 2024-12-10 01:22:54 +0000
commit1db6b990eaa47938c24063991c64e4ee608d362b (patch)
tree4035ab3a06ee759c6f032e97f992e35bb4968bf3
parentec5b02f0c151d01a2565b4d9788297a4b671393f (diff)
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:b1821a1d75ef8fdaafb37df12c8ea7333ece0fb9) Merged-In: I87517e9b116e5c6ca4ba05729139455c09a31d53 Merged-In: I3e08f85d8d6c5de119f024a518d499dcd86f6006 Change-Id: I83537fde6cad2073e767d56c27cd25b82f29c235
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 5f749ec77ade..d199a41a6d84 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13155,8 +13155,7 @@ public class ActivityManagerService extends IActivityManager.Stub
+ ") when registering receiver " + receiver);
}
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);
}