From 4d44021acc295b2f5c47312771db6f4f83ab7a85 Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Thu, 24 Nov 2022 15:04:21 +0800 Subject: [PATCH] Remove the redundant check. The max package name length restriction is already applied when creating session. Removing the redundant check to avoid bumping SessionParams.MAX_PACKAGE_NAME_LENGTH. Bug: 236687884 Test: atest CtsPackageInstallTestCases Change-Id: I79954b3d73bbfbb8d5b64329d86f5ff79a874d60 --- .../src/com/android/packageinstaller/InstallStart.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java index e4bdab89532b9..88c10365219b5 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java @@ -28,7 +28,6 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageInstaller; -import android.content.pm.PackageInstaller.SessionParams; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ProviderInfo; @@ -104,10 +103,9 @@ public class InstallStart extends Activity { Intent.EXTRA_INSTALLER_PACKAGE_NAME); if (installerPackageNameFromIntent != null) { final String callingPkgName = getLaunchedFromPackage(); - if (installerPackageNameFromIntent.length() >= SessionParams.MAX_PACKAGE_NAME_LENGTH - || (!TextUtils.equals(installerPackageNameFromIntent, callingPkgName) + if (!TextUtils.equals(installerPackageNameFromIntent, callingPkgName) && mPackageManager.checkPermission(Manifest.permission.INSTALL_PACKAGES, - callingPkgName) != PackageManager.PERMISSION_GRANTED)) { + callingPkgName) != PackageManager.PERMISSION_GRANTED) { Log.e(LOG_TAG, "The given installer package name " + installerPackageNameFromIntent + " is invalid. Remove it."); EventLog.writeEvent(0x534e4554, "236687884", getLaunchedFromUid(),