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

[Bugfix]audio:fix NPE when buildBluetoothRoutes

Browse Source 
Caused by: java.lang.NullPointerException: Attempt to invoke interface method 'java.util.Iterator java.util.Set.iterator()' on a null object reference
at com.android.server.media.BluetoothRouteProvider.buildBluetoothRoutes(BluetoothRouteProvider.java:165)
at com.android.server.media.BluetoothRouteProvider.access$900(BluetoothRouteProvider.java:53)
at com.android.server.media.BluetoothRouteProvider$AdapterStateChangedReceiver.onReceive(BluetoothRouteProvider.java:462)
at com.android.server.media.BluetoothRouteProvider$BluetoothBroadcastReceiver.onReceive(BluetoothRouteProvider.java:445)
at android.app.LoadedApk$ReceiverDispatcher$Args.lambda$getRunnable$0$LoadedApk$ReceiverDispatcher$Args(LoadedApk.java:1564)

Signed-off-by: liuxiaoyu7 <liuxiaoyu7@xiaomi.com>
Change-Id: I6828a319248deff851d46f259cfaf392fde04a1d
This commit is contained in:
liuxiaoyu7
2020-12-09 14:21:51 +08:00
parent 3acec4d14f
commit ffbff53cbe
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

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