Merge "Move findBluetoothRouteWithRouteId closer to the usage and make private" (45189089) · Commits · e / os / android_frameworks_base

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

+12 −12

Original line number	Diff line number	Diff line
		@@ -176,6 +176,18 @@ class BluetoothRouteProvider {
		}
		}

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

		/**
		* Clears the active device for all known profiles.
		*/
		@@ -238,18 +250,6 @@ class BluetoothRouteProvider {
		return routes;
		}

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

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