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

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -436,7 +436,6 @@ 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);
		@@ -666,7 +665,6 @@ public final class Utils {
		return false;
		}

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

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

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