diff options
| author | 2025-01-05 23:56:27 -0800 | |
|---|---|---|
| committer | 2025-01-05 23:56:27 -0800 | |
| commit | a8e764dec2ead645c3899ec4575fd7aa13896c89 (patch) | |
| tree | 471ec9342fc5c1079e194c396520eea1eaf558ef | |
| parent | 2120690eda9bb4031b30ccf9e21f9b40dbf7365b (diff) | |
| parent | ffe032c1c5d7b2c4926bea110e44a861671e7999 (diff) | |
Merge "Don't allow non-system uids to use "android" as calling package." into udc-dev am: ffe032c1c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30693948
Change-Id: I335034c9a2299cfd630473355edbc2b42bceb21a
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 46adc79ed056..4f6b855ebd2c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13804,8 +13804,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); } |