diff options
| author | 2025-01-06 00:22:02 -0800 | |
|---|---|---|
| committer | 2025-01-06 00:22:02 -0800 | |
| commit | 23f444f9d98af8f343399646d40bb1d6d592ab4e (patch) | |
| tree | 5459455d037f846b1b0967612db5d17506d7035f | |
| parent | fca19c4c95981320a8f0e1287daf91be8b910993 (diff) | |
| parent | a8e764dec2ead645c3899ec4575fd7aa13896c89 (diff) | |
Merge "Don't allow non-system uids to use "android" as calling package." into udc-dev am: ffe032c1c5 am: a8e764dec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30693948
Change-Id: Ib379afe54432dd9b56b9feb8296498a828c30ef2
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 5402f54da85c..bb2445e3c826 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13954,8 +13954,7 @@ public class ActivityManagerService extends IActivityManager.Stub 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); } |