From 008e8e346c384c71868a9693b7b2aaacca96f989 Mon Sep 17 00:00:00 2001
From: jiangyongmao1 <jiangyongmao1@xiaomi.com>
Date: Mon, 1 Nov 2021 15:10:06 +0800
Subject: [PATCH] audio : fix NPE in
 frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java

see https://issuetracker.google.com/issues/204702270

Change-Id: I2a9968c78ffd32e3217f42e584e9908d765124d7
Signed-off-by: jiangyongmao1 <jiangyongmao1@xiaomi.com>
---
 .../com/android/server/media/BluetoothRouteProvider.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
index 73de0f814325..ffc1aed4c672 100644
--- a/services/core/java/com/android/server/media/BluetoothRouteProvider.java
+++ b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
@@ -51,6 +51,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 class BluetoothRouteProvider {
     private static final String TAG = "BTRouteProvider";
@@ -174,8 +175,9 @@ class BluetoothRouteProvider {
 
     private void buildBluetoothRoutes() {
         mBluetoothRoutes.clear();
-        if (mBluetoothAdapter.getBondedDevices() != null) {
-            for (BluetoothDevice device : mBluetoothAdapter.getBondedDevices()) {
+        Set<BluetoothDevice> bondedDevices = mBluetoothAdapter.getBondedDevices();
+        if (bondedDevices != null) {
+            for (BluetoothDevice device : bondedDevices) {
                 if (device.isConnected()) {
                     BluetoothRouteInfo newBtRoute = createBluetoothRoute(device);
                     if (newBtRoute.connectedProfiles.size() > 0) {