Merge "audio: Fix possible NullPointerException when DEBUG is true"

2022-01-21 14:58:19 +00:00
parent 4939f35ba3 7cddc6a227
commit 4d7383001f
1 changed files with 10 additions and 1 deletions
--- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java
+++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
@@ -344,10 +344,19 @@ class BluetoothRouteProvider {
    }

    private void addActiveRoute(BluetoothRouteInfo btRoute) {
+        if (btRoute == null) {
+            if (DEBUG) {
+                Log.d(TAG, " btRoute is null");
+            }
+            return;
+        }
        if (DEBUG) {
            Log.d(TAG, "Adding active route: " + btRoute.route);
        }
-        if (btRoute == null || mActiveRoutes.contains(btRoute)) {
+        if (mActiveRoutes.contains(btRoute)) {
+            if (DEBUG) {
+                Log.d(TAG, " btRoute is already added.");
+            }
            return;
        }
        setRouteConnectionState(btRoute, STATE_CONNECTED);