Commit ffbff53c authored Dec 09, 2020 by liuxiaoyu7

[Bugfix]audio:fix NPE when buildBluetoothRoutes

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

parent 3acec4d1

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ class BluetoothRouteProvider {

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

		@Nullable
		MediaRoute2Info getSelectedRoute() {