Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5e24cedfd54bf03a98028aa04c1428e5db7e77d8
This commit is contained in:
Treehugger Robot
2021-11-12 19:03:22 +00:00
committed by Automerger Merge Worker
parent cecc90ee1b 5903b83fbd
commit c7877bf5e5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/media/BluetoothRouteProvider.java
View File

@@ -51,6 +51,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
class BluetoothRouteProvider { class BluetoothRouteProvider {
private static final String TAG = "BTRouteProvider"; private static final String TAG = "BTRouteProvider";
@@ -174,8 +175,9 @@ class BluetoothRouteProvider {
private void buildBluetoothRoutes() { private void buildBluetoothRoutes() {
mBluetoothRoutes.clear(); mBluetoothRoutes.clear();
if (mBluetoothAdapter.getBondedDevices() != null) { Set<BluetoothDevice> bondedDevices = mBluetoothAdapter.getBondedDevices();
for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) { if (bondedDevices != null) {
for (BluetoothDevice device : bondedDevices) {
if (device.isConnected()) { if (device.isConnected()) {
BluetoothRouteInfo newBtRoute = createBluetoothRoute(device); BluetoothRouteInfo newBtRoute = createBluetoothRoute(device);
if (newBtRoute.connectedProfiles.size() > 0) { if (newBtRoute.connectedProfiles.size() > 0) {