diff options
| author | 2025-01-05 20:57:42 -0800 | |
|---|---|---|
| committer | 2025-01-05 20:57:42 -0800 | |
| commit | a1138270cedf4caf3aeeb36d31daceb722e7191c (patch) | |
| tree | 0dee0ef63d2250c19bc0ed254a3b53855c807e61 | |
| parent | 0dcbbeabcef92024f7d078e01ed13a19b23e7b1c (diff) | |
| parent | 92f0fc1e1ad457e5bb2db073ca31399b60450f84 (diff) | |
Merge "InstallPackageHelper: fiX the NPE problem." into main am: 92f0fc1e1a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3433745
Change-Id: I009aeeb8789186a1746ad2c7445ac3756da59366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index f449126af0f9..d4efb5c2951e 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -1387,7 +1387,7 @@ final class InstallPackageHelper { boolean systemApp = false; boolean replace = false; synchronized (mPm.mLock) { - final PackageSetting ps = mPm.mSettings.getPackageLPr(pkgName); + PackageSetting ps = mPm.mSettings.getPackageLPr(pkgName); // Check if installing already existing package if ((installFlags & PackageManager.INSTALL_REPLACE_EXISTING) != 0) { String oldName = mPm.mSettings.getRenamedPackageLPr(pkgName); @@ -1398,14 +1398,15 @@ final class InstallPackageHelper { // name. We must continue using the original name, so // rename the new package here. parsedPackage.setPackageName(oldName); - pkgName = parsedPackage.getPackageName(); - replace = true; + pkgName = oldName; + ps = mPm.mSettings.getPackageLPr(oldName); if (DEBUG_INSTALL) { Slog.d(TAG, "Replacing existing renamed package: oldName=" + oldName + " pkgName=" + pkgName); } - } else if (ps != null) { - // This package, under its official name, already exists + } + if (ps != null) { + // This package, under its official name or its old name, already exists // on the device; we should replace it. replace = true; if (DEBUG_INSTALL) Slog.d(TAG, "Replace existing package: " + pkgName); |