Merge "DO NOT MERGE: Use a copy of bt device profile list when updating" into qt-qpr1-dev

Author: TreeHugger Robot

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

@@ -661,6 +661,10 @@ public List<LocalBluetoothProfile> getProfiles() {
         return Collections.unmodifiableList(mProfiles);
     }
 
+    public List<LocalBluetoothProfile> getProfileListCopy() {
+        return new ArrayList<>(mProfiles);
+    }
+
     public List<LocalBluetoothProfile> getConnectableProfiles() {
         List<LocalBluetoothProfile> connectableProfiles =
                 new ArrayList<LocalBluetoothProfile>();

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

@@ -277,7 +277,7 @@ private void updateAudioProfile() {
         boolean otherProfileConnected = false;
 
         for (CachedBluetoothDevice device : getDevices()) {
-            for (LocalBluetoothProfile profile : device.getProfiles()) {
+            for (LocalBluetoothProfile profile : device.getProfileListCopy()) {
                 int profileId = profile.getProfileId();
                 boolean isConnected = device.isConnectedProfile(profile);
                 if (profileId == BluetoothProfile.HEADSET