From 5da867597eb31c9e2296928c4a21200610747508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Wed, 21 Feb 2018 09:54:33 +0100 Subject: [PATCH] Print correct version code when skipping outdated system packages When a newer version of a package exists on /data, the package manager will skip scanning the outdated version on /system. As part of this the following is printed to logcat: Package at ignored: updated version better than this Teach the package manager to read from the correct variable (it used to be identical to ). Bug: 78871949 Test: manual (upgrade a pre-installed app, check logcat on reboot) Change-Id: Iaa4e43d2f91ca33a0e56e90c233d5d02abed781e --- .../core/java/com/android/server/pm/PackageManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index e7910d3c49443..ff64d39e6c425 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8748,7 +8748,7 @@ public class PackageManagerService extends IPackageManager.Stub // equal to the version on the /data partition. Throw an exception and use // the application already installed on the /data partition. throw new PackageManagerException(Log.WARN, "Package " + pkg.packageName + " at " - + pkg.codePath + " ignored: updated version " + disabledPkgSetting.versionCode + + pkg.codePath + " ignored: updated version " + pkgSetting.versionCode + " better than this " + pkg.getLongVersionCode()); }