Commit 6f9045cd authored Mar 22, 2019 by Philip P. Moltmann

Do not remove location permissions on Q-beta OTAs

The Q SDK version is not yet defined. Hence every time an OTA happens
the previous version of the package settings file is '28' which is less
than Build.VERSION_CODES.Q==10000. Hence before we ran the p->q upgrade
code for ever Q-beta OTA.

One upgrade step is to remove all location permission grants. I.e.
currently we remove all location permission grant on everye Q-beta OTA,
which is annoying.

Once Q is defined at 29, the package settings file will update to
version==29. At this time we will run the p->q upgrade code one more
time, but this is the last time.

Fixes: 129132948
Test: Simulated OTA and saw location permissions not removed.
Change-Id: I667b7fe345335adfbefea3e6f93401e59b1ce42b

parent be45bbdc

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;