Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No need to fake P->Q upgrade anymore" into qt-dev

Browse Source 
am: a1eb76aca1

Change-Id: Ib1cbe723f930e2f7a4ee428027a0ee9e755400d1
This commit is contained in:
Philip P. Moltmann
2019-06-03 10:01:12 -07:00
committed by android-build-merger
parent 71df88b5b0 a1eb76aca1
commit deef5e7228
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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;