Merge "Fix autogrant of location permissions for use-open-wifi apps." (40de28eb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -155,11 +155,6 @@ public final class DefaultPermissionGrantPolicy {
		ACTIVITY_RECOGNITION_PERMISSIONS.add(Manifest.permission.ACTIVITY_RECOGNITION);
		}

		private static final Set<String> COARSE_LOCATION_PERMISSIONS = new ArraySet<>();
		static {
		COARSE_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION);
		}

		private static final Set<String> CALENDAR_PERMISSIONS = new ArraySet<>();
		static {
		CALENDAR_PERMISSIONS.add(Manifest.permission.READ_CALENDAR);
		@@ -803,8 +798,7 @@ public final class DefaultPermissionGrantPolicy {

		private void grantDefaultPermissionsToDefaultSystemUseOpenWifiApp(
		String useOpenWifiPackage, int userId) {
		grantPermissionsToSystemPackage(
		useOpenWifiPackage, userId, COARSE_LOCATION_PERMISSIONS);
		grantPermissionsToSystemPackage(useOpenWifiPackage, userId, ALWAYS_LOCATION_PERMISSIONS);
		}

		public void grantDefaultPermissionsToDefaultSmsApp(String packageName, int userId) {
		@@ -824,7 +818,7 @@ public final class DefaultPermissionGrantPolicy {

		public void grantDefaultPermissionsToDefaultUseOpenWifiApp(String packageName, int userId) {
		Log.i(TAG, "Granting permissions to default Use Open WiFi app for user:" + userId);
		grantIgnoringSystemPackage(packageName, userId, COARSE_LOCATION_PERMISSIONS);
		grantIgnoringSystemPackage(packageName, userId, ALWAYS_LOCATION_PERMISSIONS);
		}

		public void grantDefaultPermissionsToDefaultSimCallManager(String packageName, int userId) {