Merge "Use new api to disconnect all bt profiles"

am: ceeb04aeaf Change-Id: I139c5408cb9c9a8b87837ddd844014e9dc1f3fe7
2019-12-11 19:27:38 -08:00
parent 130286de4e ceeb04aeaf
commit 2c80f4ba85
1 changed files with 1 additions and 3 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -164,9 +164,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>

    public void disconnect() {
        synchronized (mProfileLock) {
-            for (LocalBluetoothProfile profile : mProfiles) {
-                disconnect(profile);
-            }
+            mLocalAdapter.disconnectAllEnabledProfiles(mDevice);
        }
        // Disconnect  PBAP server in case its connected
        // This is to ensure all the profiles are disconnected as some CK/Hs do not