Merge "Sanitize system route types to TYPE_UNKNOWN for non-system providers" into main (d9030e84) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaRoute2Info.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.annotation.TestApi;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -813,6 +814,34 @@ public final class MediaRoute2Info implements Parcelable {
		\|\| mAllowedPackages.contains(packageName);
		}

		/**
		* Returns whether this route's type can only be published by the system route provider.
		*
		* @see #isSystemRoute()
		* @hide
		*/
		// The default case catches all other types.
		@SuppressLint("SwitchIntDef")
		public boolean isSystemRouteType() {
		return switch (mType) {
		case TYPE_BUILTIN_SPEAKER,
		TYPE_BLUETOOTH_A2DP,
		TYPE_DOCK,
		TYPE_BLE_HEADSET,
		TYPE_HEARING_AID,
		TYPE_HDMI,
		TYPE_HDMI_ARC,
		TYPE_HDMI_EARC,
		TYPE_USB_ACCESSORY,
		TYPE_USB_DEVICE,
		TYPE_USB_HEADSET,
		TYPE_WIRED_HEADPHONES,
		TYPE_WIRED_HEADSET ->
		true;
		default -> false;
		};
		}

		/** Returns the route suitability status. */
		@SuitabilityStatus
		@FlaggedApi(FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES)

+19 −3

Original line number	Diff line number	Diff line
		@@ -475,9 +475,25 @@ public abstract class MediaRoute2ProviderService extends Service {
		*/
		public final void notifyRoutes(@NonNull Collection<MediaRoute2Info> routes) {
		Objects.requireNonNull(routes, "routes must not be null");
		mProviderInfo = new MediaRoute2ProviderInfo.Builder()
		.addRoutes(routes)
		.build();
		List<MediaRoute2Info> sanitizedRoutes = new ArrayList<>(routes.size());

		for (MediaRoute2Info route : routes) {
		if (route.isSystemRouteType()) {
		Log.w(
		TAG,
		"Attempting to add a system route type from a non-system route "
		+ "provider. Overriding type to TYPE_UNKNOWN. Route: "
		+ route);
		sanitizedRoutes.add(
		new MediaRoute2Info.Builder(route)
		.setType(MediaRoute2Info.TYPE_UNKNOWN)
		.build());
		} else {
		sanitizedRoutes.add(route);
		}
		}

		mProviderInfo = new MediaRoute2ProviderInfo.Builder().addRoutes(sanitizedRoutes).build();
		schedulePublishState();
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -839,6 +839,13 @@ final class MediaRoute2ProviderServiceProxy extends MediaRoute2Provider {
		+ "Disallowed route: "
		+ route);
		}

		if (route.isSystemRouteType()) {
		throw new SecurityException(
		"Only the system is allowed to publish routes with system route types. "
		+ "Disallowed route: "
		+ route);
		}
		}

		Connection connection = mConnectionRef.get();