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

Commit 94d29781 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 udc-dev am: ffe032c1

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



Change-Id: I738474111e06836e281236922f4e0a16b71d8b06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca50958d ffe032c1

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

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

            }