diff options
| author | 2025-01-16 11:33:34 -0800 | |
|---|---|---|
| committer | 2025-01-16 11:33:34 -0800 | |
| commit | 17eae43fa562b193bd2641c7cb22159e9ab9d7d5 (patch) | |
| tree | 2bf971ea9c9fadce060f4931774578e62953d23f | |
| parent | e97f2a9cbe761cb052d9500883af2c7a2485f9bd (diff) | |
| parent | 8c3c1fd97cff69d50d80f5cfaa5cc4c34a886aa1 (diff) | |
Merge "Don't allow non-system uids to use "android" as calling package." into tm-dev am: 04edc2395f am: 8c3c1fd97c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30746827
Change-Id: I496428abe5c71e16e9e3c5cbb1a59c7858d05408
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 c1e576aae590..63dba26bb57c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13188,8 +13188,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); } |