Merge "Handle NPE from BluetoothRouteProvider" (5a1f9e67) · Commits · e / os / android_frameworks_base

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -345,18 +345,14 @@ class BluetoothRouteProvider {

		private void addActiveRoute(BluetoothRouteInfo btRoute) {
		if (btRoute == null) {
		if (DEBUG) {
		Log.d(TAG, " btRoute is null");
		}
		Slog.w(TAG, "addActiveRoute: btRoute is null");
		return;
		}
		if (DEBUG) {
		Log.d(TAG, "Adding active route: " + btRoute.route);
		}
		if (mActiveRoutes.contains(btRoute)) {
		if (DEBUG) {
		Log.d(TAG, " btRoute is already added.");
		}
		Slog.w(TAG, "addActiveRoute: btRoute is already added.");
		return;
		}
		setRouteConnectionState(btRoute, STATE_CONNECTED);
		@@ -389,6 +385,12 @@ class BluetoothRouteProvider {
		private void addActiveDevices(BluetoothDevice device) {
		// Let the given device be the first active device
		BluetoothRouteInfo activeBtRoute = mBluetoothRoutes.get(device.getAddress());
		// This could happen if ACTION_ACTIVE_DEVICE_CHANGED is sent before
		// ACTION_CONNECTION_STATE_CHANGED is sent.
		if (activeBtRoute == null) {
		activeBtRoute = createBluetoothRoute(device);
		mBluetoothRoutes.put(device.getAddress(), activeBtRoute);
		}
		addActiveRoute(activeBtRoute);

		// A bluetooth route with the same route ID should be added.