Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18062a45 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: Fix possible NullPointerException when DEBUG is true" am: 4d738300 am: 18b3180f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814782

Change-Id: I1542f0660b984382a3876e70c642e2bb22800f3f
parents 47b398bc 18b3180f

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

+10 −1
Original line number Diff line number Diff line
@@ -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);