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

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

Merge "audio : fix NPE in... 

Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java" am: 9e742aa0 am: 5903b83f

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

Change-Id: I5e24cedfd54bf03a98028aa04c1428e5db7e77d8
parents cecc90ee 5903b83f

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

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Set;



class BluetoothRouteProvider {

    private static final String TAG = "BTRouteProvider";
@@ -174,8 +175,9 @@ class BluetoothRouteProvider { 


    private void buildBluetoothRoutes() {

        mBluetoothRoutes.clear();

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

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

        Set<BluetoothDevice> bondedDevices = mBluetoothAdapter.getBondedDevices();

        if (bondedDevices != null) {

            for (BluetoothDevice device : bondedDevices) {

                if (device.isConnected()) {

                    BluetoothRouteInfo newBtRoute = createBluetoothRoute(device);

                    if (newBtRoute.connectedProfiles.size() > 0) {