OSDN Git Service

Do not send AT+CHLD=? if the 3-way call feature is not supported
authorDevin Kim <dojip.kim@lge.com>
Fri, 15 Jan 2016 02:21:17 +0000 (02:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jan 2016 02:21:17 +0000 (02:21 +0000)
am: 15df6d411e

* commit '15df6d411e871e2e1366a3599bb990ce0cb9aae1':
  Do not send AT+CHLD=? if the 3-way call feature is not supported

bta/hf_client/bta_hf_client_main.c

index c573db6..f7afbf4 100644 (file)
@@ -612,7 +612,8 @@ void bta_hf_client_slc_seq(BOOLEAN error)
         break;
 
     case BTA_HF_CLIENT_AT_CMER:
-        if (bta_hf_client_cb.scb.peer_features & BTA_HF_CLIENT_PEER_FEAT_3WAY)
+        if (bta_hf_client_cb.scb.peer_features & BTA_HF_CLIENT_PEER_FEAT_3WAY
+               && bta_hf_client_cb.scb.features & BTA_HF_CLIENT_FEAT_3WAY)
         {
             bta_hf_client_send_at_chld('?', 0);
         }