From d44f150f6d2c41611a3d4c344b8540d27e32c635 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Fri, 31 May 2019 09:48:22 -0700 Subject: [PATCH] No need to fake P->Q upgrade anymore Not that P and Q have different SDK levels, no need to take it anymore. Test: Booted Fixes: 129132948 Change-Id: I3b125e1f76b76dd3c0be6db7c0658f15996f5dd5 --- .../java/com/android/server/pm/PackageManagerService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index a1162373c16f7..d9068aa76c316 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2578,9 +2578,7 @@ public class PackageManagerService extends IPackageManager.Stub mIsPreNUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N; mIsPreNMR1Upgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N_MR1; - mIsPreQUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.Q - // STOPSHIP: Remove next line when API level for Q is defined. - && Build.VERSION.SDK_INT > Build.VERSION_CODES.P; + mIsPreQUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.Q; int preUpgradeSdkVersion = ver.sdkVersion;