commit 9e742aa02f53f4c919c7cb51a6f0cdf08b466cba
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 12 18:35:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 12 18:35:28 2021 +0000
tree b7862c1188a8f47a9c58da0a3c6fd18b2ec9466d
parent dcb51970ab3b016c01ba310287b1c216937d63f7
parent 008e8e346c384c71868a9693b7b2aaacca96f989

Merge "audio : fix NPE in frameworks/base/services/core/java/com/android/server/media/BluetoothRouteProvider.java"

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

diff --git a/services/core/java/com/android/server/media/BluetoothRouteProvider.java b/services/core/java/com/android/server/media/BluetoothRouteProvider.java
index 73de0f8..ffc1aed 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.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 @@
 
     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) {