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

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

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-14 01:33:36 +00:00
committed by Gerrit Code Review
parent 4e3959e571 ffbff53cbe
commit b801d3549f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,6 +165,7 @@ class BluetoothRouteProvider {
private void buildBluetoothRoutes() { private void buildBluetoothRoutes() {
mBluetoothRoutes.clear(); mBluetoothRoutes.clear();
if (mBluetoothAdapter.getBondedDevices() != null) {
for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) { for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) {
if (device.isConnected()) { if (device.isConnected()) {
BluetoothRouteInfo newBtRoute = createBluetoothRoute(device); BluetoothRouteInfo newBtRoute = createBluetoothRoute(device);
@@ -174,6 +175,7 @@ class BluetoothRouteProvider {
} }
} }
} }
}
@Nullable @Nullable
MediaRoute2Info getSelectedRoute() { MediaRoute2Info getSelectedRoute() {