Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deef5e72 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

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

am: a1eb76ac

Change-Id: Ib1cbe723f930e2f7a4ee428027a0ee9e755400d1
parents 71df88b5 a1eb76ac

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

+1 −3
Original line number Diff line number Diff line
@@ -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;