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

Commit f22662ad 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... 

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

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

Change-Id: I4e2346dd330f63ac2d0f21bfc142d4d3c2baba92
parents ec72e04d 88f2fffc

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

+5 −2
Original line number Diff line number Diff line
@@ -16987,6 +16987,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;

        }
@@ -16995,14 +16996,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);















                }