summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mayank Dandwani <mayankkk@google.com> 2025-03-06 12:51:21 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-06 12:51:21 -0800
commit77a5581087342fc5c923aa5fbccd38ae2990fb23 (patch)
tree5fbb05f72f2c5f43aa869ee6034fd89558388aa7
parent7d91a15a545ea1382eca13d371e687b1e1169e96 (diff)
parentea34308ee376ec7e4235c7395675d1e6676547e8 (diff)
Allow core uids to register receiver as "android". am: e690fb6363 am: ea34308ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/32106224 Change-Id: I768e0b51d6bb7b8d15e4152518a54751f8a7de45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 63dba26bb57c..de69d5969aae 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13187,7 +13187,7 @@ public class ActivityManagerService extends IActivityManager.Stub
+ " (pid=" + Binder.getCallingPid()
+ ") when registering receiver " + receiver);
}
- if (callerApp.info.uid != SYSTEM_UID
+ if (!UserHandle.isCore(callerApp.info.uid)
&& !callerApp.getPkgList().containsKey(callerPackage)) {
throw new SecurityException("Given caller package " + callerPackage
+ " is not running in process " + callerApp);