Merge "Route profile connection retry through APM" into bt-sys.lnx.12.0

1 files changed, 13 insertions, 3 deletions

diff --git a/src/com/android/bluetooth/btservice/PhonePolicy.java b/src/com/android/bluetooth/btservice/PhonePolicy.java
index c461d4aef..d9b2a6eff 100644
--- a/src/com/android/bluetooth/btservice/PhonePolicy.java
+++ b/src/com/android/bluetooth/btservice/PhonePolicy.java
@@ -41,6 +41,7 @@ import com.android.bluetooth.a2dp.A2dpService;
 import com.android.bluetooth.a2dpsink.A2dpSinkService;
 import com.android.bluetooth.apm.ApmConstIntf;
 import com.android.bluetooth.apm.MediaAudioIntf;
+import com.android.bluetooth.apm.CallAudioIntf;
 import com.android.bluetooth.btservice.InteropUtil;
 import com.android.bluetooth.btservice.storage.DatabaseManager;
 import com.android.bluetooth.hearingaid.HearingAidService;
@@ -932,7 +933,12 @@ class PhonePolicy {
                      (hsService.getConnectionPolicy(device) >= BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {
                     debugLog("Retrying connection to HS with device " + device);
                     mHeadsetRetrySet.add(device);
-                    hsService.connect(device);
+                    if (ApmConstIntf.getLeAudioEnabled()) {
+                        CallAudioIntf mCallAudio = CallAudioIntf.get();
+                        mCallAudio.connect(device);
+                    } else {
+                        hsService.connect(device);
+                    }
                 } else {
                     debugLog("do not initiate connect as A2dp is not connected");
                 }
@@ -962,8 +968,12 @@ class PhonePolicy {
                     (a2dpService.getConnectionPolicy(device) >= BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {
                     debugLog("Retrying connection to A2DP with device " + device);
                     mA2dpRetrySet.add(device);
-                    a2dpService.connect(device);
-                } else {
+                    if (ApmConstIntf.getLeAudioEnabled()) {
+                        MediaAudioIntf mMediaAudio = MediaAudioIntf.get();
+                        mMediaAudio.connect(device);
+                    } else {
+                        a2dpService.connect(device);
+                    }
                     debugLog("do not initiate connect as HFP is not connected");
                 }
             }