commit 0567e66c2cdd05aa6f124239d1273813064ecae4
author SongFerng Wang <songferngwang@google.com> Thu Mar 10 07:37:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 10 07:37:45 2022 +0000
tree 66c95c8daa3b9f935a2955900609a188a0a0aab3
parent e76c420a0e55b272e159a5fb5ed3f198b596ed21
parent ececa85c9e205d14bc276132c7d11ec40afdb9ef

Merge "[LE] Connect and disconnect both LE headsets" am: ececa85c9e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2010675

Change-Id: Ifbc0100528ed82e02347a79bcff09584110c698d

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

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index d6f08c6..981d8e4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -283,6 +283,12 @@
 
     public void disconnect() {
         synchronized (mProfileLock) {
+            if (getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+                for (CachedBluetoothDevice member : getMemberDevice()) {
+                    Log.d(TAG, "Disconnect the member(" + member.getAddress() + ")");
+                    member.disconnect();
+                }
+            }
             mDevice.disconnect();
         }
         // Disconnect  PBAP server in case its connected
@@ -397,6 +403,12 @@
             }
 
             mDevice.connect();
+            if (getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {
+                for (CachedBluetoothDevice member : getMemberDevice()) {
+                    Log.d(TAG, "connect the member(" + member.getAddress() + ")");
+                    member.connect();
+                }
+            }
         }
     }