Merge "Don't expand loc permission on fresh Q install" into qt-dev (41c7a484) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java

+38 −22

Original line number	Diff line number	Diff line
		@@ -78,7 +78,18 @@ class RuntimePermissionsUpgradeController {
		\| PackageManager.GET_PERMISSIONS);
		final int appCount = apps.size();

		if (currentVersion <= 0) {
		final boolean sdkUpgradedFromP;
		if (currentVersion <= -1) {
		Log.i(LOG_TAG, "Upgrading from Android P");

		sdkUpgradedFromP = true;

		currentVersion = 0;
		} else {
		sdkUpgradedFromP = false;
		}

		if (currentVersion == 0) {
		Log.i(LOG_TAG, "Grandfathering SMS and CallLog permissions");

		final List<String> smsPermissions = Utils.getPlatformPermissionNamesOfGroup(
		@@ -105,6 +116,7 @@ class RuntimePermissionsUpgradeController {
		}

		if (currentVersion == 1) {
		if (sdkUpgradedFromP) {
		Log.i(LOG_TAG, "Expanding location permissions");

		for (int i = 0; i < appCount; i++) {
		@@ -120,8 +132,8 @@ class RuntimePermissionsUpgradeController {
		continue;
		}

		final AppPermissionGroup group = AppPermissionGroup.create(context, app, perm,
		false);
		final AppPermissionGroup group = AppPermissionGroup.create(context, app,
		perm, false);
		final AppPermissionGroup bgGroup = group.getBackgroundPermissions();

		if (group.areRuntimePermissionsGranted()
		@@ -134,6 +146,10 @@ class RuntimePermissionsUpgradeController {
		break;
		}
		}
		} else {
		Log.i(LOG_TAG, "Not expanding location permissions as this is not an upgrade "
		+ "from Android P");
		}

		currentVersion = 2;
		}