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

Commit b801d354 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 4e3959e5 ffbff53c

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() {