From 169fbe9ed3ed602cdd73e3d9d8aa3ace6b6b474c Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Fri, 2 Jun 2023 10:09:07 -0700 Subject: [PATCH] [pm] fix potential NPE in system server getSourceInstallerPackageName is NPE prone and can be replaced by a safe method (getInstallerPackageName). BUG: 284423191 Test: presubmit Change-Id: I404bd7544eb059597982ca9c3bc6d6f0ba297887 --- .../java/com/android/server/pm/InstallPackageHelper.java | 2 +- .../core/java/com/android/server/pm/InstallRequest.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 06db5be349d47..50f1673cae443 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -2145,7 +2145,7 @@ final class InstallPackageHelper { final String pkgName = pkg.getPackageName(); final int[] installedForUsers = installRequest.getOriginUsers(); final int installReason = installRequest.getInstallReason(); - final String installerPackageName = installRequest.getSourceInstallerPackageName(); + final String installerPackageName = installRequest.getInstallerPackageName(); if (DEBUG_INSTALL) Slog.d(TAG, "New package installed in " + pkg.getPath()); synchronized (mPm.mLock) { diff --git a/services/core/java/com/android/server/pm/InstallRequest.java b/services/core/java/com/android/server/pm/InstallRequest.java index 95e7904507242..34648740d54c5 100644 --- a/services/core/java/com/android/server/pm/InstallRequest.java +++ b/services/core/java/com/android/server/pm/InstallRequest.java @@ -366,12 +366,6 @@ final class InstallRequest { public String getApexModuleName() { return mApexModuleName; } - - @Nullable - public String getSourceInstallerPackageName() { - return mInstallArgs.mInstallSource.mInstallerPackageName; - } - public boolean isRollback() { return mInstallArgs != null && mInstallArgs.mInstallReason == PackageManager.INSTALL_REASON_ROLLBACK;