Merge "Prevent auto-granting of location permission via DPM" (d474dcd5) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -9334,6 +9334,16 @@ public class DevicePolicyManager {
		* {@link android.os.Build.VERSION_CODES#M} the app-op matching the permission is set to
		* {@link android.app.AppOpsManager#MODE_IGNORED}, but the permission stays granted.
		*
		* NOTE: Starting from Android R, location-related permissions cannot be granted by the
		* admin: Calling this method with {@link #PERMISSION_GRANT_STATE_GRANTED} for any of the
		* following permissions will return false:
		*
		* <ul>
		* <li>{@code ACCESS_FINE_LOCATION}</li>
		* <li>{@code ACCESS_BACKGROUND_LOCATION}</li>
		* <li>{@code ACCESS_COARSE_LOCATION}</li>
		* </ul>
		*
		* @param admin Which profile or device owner this request is associated with.
		* @param packageName The application to grant or revoke a permission to.
		* @param permission The permission to grant or revoke.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+25 −9

Original line number	Diff line number	Diff line
		@@ -445,6 +445,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		// A collection of user restrictions that are deprecated and should simply be ignored.
		private static final Set<String> DEPRECATED_USER_RESTRICTIONS;
		private static final String AB_DEVICE_KEY = "ro.build.ab_update";
		// Permissions related to location which must not be granted automatically
		private static final Set<String> LOCATION_PERMISSIONS;

		static {
		SECURE_SETTINGS_WHITELIST = new ArraySet<>();
		@@ -489,6 +491,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		DEPRECATED_USER_RESTRICTIONS = Sets.newHashSet(
		UserManager.DISALLOW_ADD_MANAGED_PROFILE,
		UserManager.DISALLOW_REMOVE_MANAGED_PROFILE);

		LOCATION_PERMISSIONS = Sets.newHashSet(
		permission.ACCESS_FINE_LOCATION,
		permission.ACCESS_BACKGROUND_LOCATION,
		permission.ACCESS_COARSE_LOCATION);
		}

		/**
		@@ -12390,6 +12397,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		true);
		}

		// Prevent granting location-related permissions without user consent.
		if (LOCATION_PERMISSIONS.contains(permission)
		&& grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
		&& !isUnattendedManagedKioskUnchecked()) {
		callback.sendResult(null);
		return;
		}

		if (grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED
		\|\| grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED
		\|\| grantState == DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT) {
		@@ -14981,23 +14996,24 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		}

		@Override
		public boolean isUnattendedManagedKiosk() {
		if (!mHasFeature) {
		return false;
		}
		enforceManageUsers();
		long id = mInjector.binderClearCallingIdentity();
		private boolean isUnattendedManagedKioskUnchecked() {
		try {
		return isManagedKioskInternal()
		&& getPowerManagerInternal().wasDeviceIdleFor(UNATTENDED_MANAGED_KIOSK_MS);
		} catch (RemoteException e) {
		throw new IllegalStateException(e);
		} finally {
		mInjector.binderRestoreCallingIdentity(id);
		}
		}

		@Override
		public boolean isUnattendedManagedKiosk() {
		if (!mHasFeature) {
		return false;
		}
		enforceManageUsers();
		return mInjector.binderWithCleanCallingIdentity(() -> isUnattendedManagedKioskUnchecked());
		}

		/**
		* Returns whether the device is currently being used as a publicly-accessible dedicated device.
		* Assumes that feature checks and permission checks have already been performed, and that the