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

Commit 30ff3ebc authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Fix side channel leakage from the api of setInstallerPackageName" into sc-dev am: 2006f7f5 

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

Change-Id: I3d156656f0f805642e8e1b6758f7309e657397ed
parents 505b8d4d 2006f7f5

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

+5 −2
Original line number Diff line number Diff line
@@ -16986,6 +16986,7 @@ public class PackageManagerService extends IPackageManager.Stub 
    @Override

    public void setInstallerPackageName(String targetPackage, String installerPackageName) {

        final int callingUid = Binder.getCallingUid();

        final int callingUserId = UserHandle.getUserId(callingUid);

        if (getInstantAppPackageName(callingUid) != null) {

            return;

        }
@@ -16994,14 +16995,16 @@ public class PackageManagerService extends IPackageManager.Stub 
            PackageSetting targetPackageSetting = mSettings.getPackageLPr(targetPackage);

            if (targetPackageSetting == null

                    || shouldFilterApplicationLocked(

                            targetPackageSetting, callingUid, UserHandle.getUserId(callingUid))) {

                            targetPackageSetting, callingUid, callingUserId)) {

                throw new IllegalArgumentException("Unknown target package: " + targetPackage);

            }















            PackageSetting installerPackageSetting;















            if (installerPackageName != null) {















                installerPackageSetting = mSettings.getPackageLPr(installerPackageName);













                if (installerPackageSetting == null) {













                if (installerPackageSetting == null













                        || shouldFilterApplicationLocked(













                                installerPackageSetting, callingUid, callingUserId)) {















                    throw new IllegalArgumentException("Unknown installer package: "















                            + installerPackageName);















                }