Merge "Fix missed use of old int version code in shortcut manager." (c0d9aa16) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/ShortcutPackageInfo.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -148,7 +148,7 @@ class ShortcutPackageInfo {
	if (!anyVersionOkay && (currentPackage.getLongVersionCode() < mBackupSourceVersionCode)) {		if (!anyVersionOkay && (currentPackage.getLongVersionCode() < mBackupSourceVersionCode)) {
	Slog.w(TAG, String.format(		Slog.w(TAG, String.format(
	"Can't restore: package current version %d < backed up version %d",		"Can't restore: package current version %d < backed up version %d",
	currentPackage.versionCode, mBackupSourceVersionCode));		currentPackage.getLongVersionCode(), mBackupSourceVersionCode));
	return ShortcutInfo.DISABLED_REASON_VERSION_LOWER;		return ShortcutInfo.DISABLED_REASON_VERSION_LOWER;
	}		}
	return ShortcutInfo.DISABLED_REASON_NOT_DISABLED;		return ShortcutInfo.DISABLED_REASON_NOT_DISABLED;