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

Commit a48d9a0d authored by Sumedh Sen's avatar Sumedh Sen Committed by Automerger Merge Worker
Browse files

Merge "Check whether installerPackageName contains only valid characters" into... 

Merge "Check whether installerPackageName contains only valid characters" into udc-dev am: 85ba4e6b am: e644c47d

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



Change-Id: I5a89aedcf9ba07077f38e96c79ed43a64aa3be58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07115aae e644c47d

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

+7 −2
Original line number Diff line number Diff line
@@ -693,13 +693,18 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        params.appLabel = TextUtils.trimToSize(params.appLabel,

                PackageItemInfo.MAX_SAFE_LABEL_LENGTH);



        // Validate installer package name.

        // Validate requested installer package name.

        if (params.installerPackageName != null && !isValidPackageName(

                params.installerPackageName)) {

            params.installerPackageName = null;

        }



        var requestedInstallerPackageName =

        // Validate installer package name.

        if (installerPackageName != null && !isValidPackageName(installerPackageName)) {

            installerPackageName = null;

        }



        String requestedInstallerPackageName =

                params.installerPackageName != null ? params.installerPackageName

                        : installerPackageName;