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

Commit 8ed3fb9b authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Do not remove location permissions on Q-beta OTAs"

parents b9646e70 6f9045cd

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

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













            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;





























            int preUpgradeSdkVersion = ver.sdkVersion;