Merge "PackageManagerService: Fix a null pointer exception in addForInitLI"

2021-08-20 06:09:20 +00:00
parent dd0a0ce2c1 ca051dd9d9
commit ee7e0ce88b
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12172,8 +12172,8 @@ public class PackageManagerService extends IPackageManager.Stub
            parsedPackage.hideAsFinal();
            throw new PackageManagerException(Log.WARN, "Package " + parsedPackage.getPackageName()
                    + " at " + parsedPackage.getPath() + " ignored: updated version "
-                    + pkgSetting.versionCode + " better than this "
-                    + parsedPackage.getLongVersionCode());
+                    + (pkgAlreadyExists ? String.valueOf(pkgSetting.versionCode) : "unknown")
+                    + " better than this " + parsedPackage.getLongVersionCode());
        }

        // Verify certificates against what was last scanned. Force re-collecting certificate in two