Merge "Enforce calling uid when using attribution source." into sc-dev (dba6ff2e) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/Utils.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,7 @@ public final class Utils {
		@SuppressLint("AndroidFrameworkRequiresPermission")
		private static boolean checkPermissionForDataDelivery(Context context, String permission,
		AttributionSource attributionSource, String message) {
		attributionSource.enforceCallingUid();
		final int result = PermissionChecker.checkPermissionForDataDeliveryFromDataSource(
		context, permission, PID_UNKNOWN,
		new AttributionSource(context.getAttributionSource(), attributionSource), message);
		@@ -665,6 +666,7 @@ public final class Utils {
		return false;
		}

		attributionSource.enforceCallingUid();
		if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(
		context, ACCESS_COARSE_LOCATION, PID_UNKNOWN,
		new AttributionSource(context.getAttributionSource(), attributionSource),
		@@ -691,6 +693,7 @@ public final class Utils {
		return false;
		}

		attributionSource.enforceCallingUid();
		if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(
		context, ACCESS_FINE_LOCATION, PID_UNKNOWN,
		new AttributionSource(context.getAttributionSource(), attributionSource),
		@@ -723,6 +726,7 @@ public final class Utils {
		return false;
		}

		attributionSource.enforceCallingUid();
		if (PermissionChecker.checkPermissionForDataDeliveryFromDataSource(
		context, ACCESS_FINE_LOCATION, PID_UNKNOWN,
		new AttributionSource(context.getAttributionSource(), attributionSource),