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

Commit e471179d authored by Alan Stokes's avatar Alan Stokes Committed by Automerger Merge Worker
Browse files

Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d84 

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

Change-Id: I5318dc86181969d7a21d1a2265e953930dd8a4e2
parents 553b71a5 717f3d84

services/core/java/com/android/server/pm/PackageInstallerService.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -522,7 +522,9 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 




        if ((callingUid == Process.SHELL_UID) || (callingUid == Process.ROOT_UID)) {

        if ((callingUid == Process.SHELL_UID) || (callingUid == Process.ROOT_UID)) {

            params.installFlags |= PackageManager.INSTALL_FROM_ADB;

            params.installFlags |= PackageManager.INSTALL_FROM_ADB;



            // adb installs can override the installingPackageName, but not the

            // initiatingPackageName

            installerPackageName = null;

        } else {

        } else {

            if (callingUid != Process.SYSTEM_UID) {

            if (callingUid != Process.SYSTEM_UID) {

                // The supplied installerPackageName must always belong to the calling app.

                // The supplied installerPackageName must always belong to the calling app.