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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I849ac5c7d88cbde748881d4aa85f5bacf9345d91
This commit is contained in:
Treehugger Robot
2020-12-14 01:46:14 +00:00
committed by Automerger Merge Worker
parent 30497d0911 b801d3549f
commit 62621db913
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,11 +165,13 @@ class BluetoothRouteProvider {
private void buildBluetoothRoutes() { private void buildBluetoothRoutes() {
mBluetoothRoutes.clear(); mBluetoothRoutes.clear();
for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) { if (mBluetoothAdapter.getBondedDevices() != null) {
if (device.isConnected()) { for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) {
BluetoothRouteInfo newBtRoute = createBluetoothRoute(device); if (device.isConnected()) {
if (newBtRoute.connectedProfiles.size() > 0) { BluetoothRouteInfo newBtRoute = createBluetoothRoute(device);
mBluetoothRoutes.put(device.getAddress(), newBtRoute); if (newBtRoute.connectedProfiles.size() > 0) {
mBluetoothRoutes.put(device.getAddress(), newBtRoute);
}
} }
} }
} }