diff options
| author | 2025-01-06 15:10:18 -0800 | |
|---|---|---|
| committer | 2025-01-06 15:10:18 -0800 | |
| commit | 8c3c1fd97cff69d50d80f5cfaa5cc4c34a886aa1 (patch) | |
| tree | 5f732d828a1fb9c30d25ac9e37166ce066c7f303 | |
| parent | 5a866ff09fae83084b2b585b06f6a2848f04000f (diff) | |
| parent | 04edc2395f7b1fa89c343a18ee99df54b0fd2e6b (diff) | |
Merge "Don't allow non-system uids to use "android" as calling package." into tm-dev am: 04edc2395f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30746827
Change-Id: I661aa5b01ebf2ff70ab3ac2846b6d59fb392bc42
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.java | 3 |
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); } |