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

Commit 17eae43f 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 tm-dev am: 04edc239 am: 8c3c1fd9

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



Change-Id: I496428abe5c71e16e9e3c5cbb1a59c7858d05408
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e97f2a9c 8c3c1fd9

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

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

                }