commit 511f256cc3a6dd8911fa451fe33be1f01a34e7e5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 02 22:14:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 02 22:14:49 2024 +0000
tree 2508d70e18db90de59b4a6c8b177a621f0b5210a
parent 1d562fcead65e9b78adbc5eb9e9abe8154322b1b
parent 3c7a10d969b731d01a3a3f424cf122714e595dc5

Merge "[RESTRICT AUTOMERGE] Check whether installerPackageName contains only valid characters" into sc-v2-dev

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

diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 02515cf..310c56e 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -609,12 +609,17 @@
         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;
         }
 
+        // Validate installer package name.
+        if (installerPackageName != null && !isValidPackageName(installerPackageName)) {
+            installerPackageName = null;
+        }
+
         String requestedInstallerPackageName =
                 params.installerPackageName != null ? params.installerPackageName
                         : installerPackageName;