Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59197685 authored by Mayank Dandwani's avatar Mayank Dandwani Committed by Automerger Merge Worker
Browse files

Merge "Don't allow non-system uids to use "android" as calling package." into... 

Merge "Don't allow non-system uids to use "android" as calling package." into sc-dev am: 8583436e am: ef2880d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30747180



Change-Id: Ic9cf204256f7d205931ee332bcb7716cee48aec7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33c9725d ef2880d6

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -12477,8 +12477,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);

                }