Merge "Enable transfer to hearing aid routes." into rvc-dev am: 149dc814a6 am: 9d9a3f1f3b (b7985e80) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/BluetoothRouteProvider.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ class BluetoothRouteProvider {
		private static BluetoothRouteProvider sInstance;

		@SuppressWarnings("WeakerAccess") /* synthetic access */
		// Maps hardware address to BluetoothRouteInfo
		final Map<String, BluetoothRouteInfo> mBluetoothRoutes = new HashMap<>();
		@SuppressWarnings("WeakerAccess") /* synthetic access */
		BluetoothRouteInfo mSelectedRoute = null;
		@@ -127,9 +128,10 @@ class BluetoothRouteProvider {
		return;
		}

		BluetoothRouteInfo btRouteInfo = mBluetoothRoutes.get(routeId);
		BluetoothRouteInfo btRouteInfo = findBluetoothRouteWithRouteId(routeId);

		if (btRouteInfo == null) {
		Slog.w(TAG, "transferTo: unknown route id=" + routeId);
		Slog.w(TAG, "transferTo: Unknown route. ID=" + routeId);
		return;
		}

		@@ -194,6 +196,18 @@ class BluetoothRouteProvider {
		return routes;
		}

		BluetoothRouteInfo findBluetoothRouteWithRouteId(String routeId) {
		if (routeId == null) {
		return null;
		}
		for (BluetoothRouteInfo btRouteInfo : mBluetoothRoutes.values()) {
		if (TextUtils.equals(btRouteInfo.route.getId(), routeId)) {
		return btRouteInfo;
		}
		}
		return null;
		}

		/**
		* Updates the volume for {@link AudioManager#getDevicesForStream(int) devices}.
		*