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

Commit 62621db9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix]audio:fix NPE when buildBluetoothRoutes" am: b801d354 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I849ac5c7d88cbde748881d4aa85f5bacf9345d91
parents 30497d09 b801d354

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

+7 −5
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ class BluetoothRouteProvider { 


    private void buildBluetoothRoutes() {

        mBluetoothRoutes.clear();

        if (mBluetoothAdapter.getBondedDevices() != null) {

            for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) {

                if (device.isConnected()) {

                    BluetoothRouteInfo newBtRoute = createBluetoothRoute(device);
@@ -174,6 +175,7 @@ class BluetoothRouteProvider { 
                }

            }

        }

    }



    @Nullable

    MediaRoute2Info getSelectedRoute() {