commit a25ef0b60b4ca10385dac02334dc3e4e2ad23edb
author Yoshiharu Kurita <yoshiharu.x.kurita@sonymobile.com> Wed Nov 25 18:00:30 2015 +0900
committer Andre Eisenbach <eisenbach@google.com> Mon Apr 10 22:51:05 2017 +0000
tree 469cbb4c0cb669858a26fbde59cdf09c0da6c5bf
parent 3523f28d89e5425f934c0dbdf25fed38a392f783

HFP: Disable BTRH feature

Fluoride does not notify application layer upon AT+BTRH, and always
sends error response (BTRH is not supported) to remote device.
That is, Fluoride does not support BTRH feature.
But BTRH is enabled by default, so OK is sent to remote device by mistake
before the error response is sent. This makes some carkits unstable.

Bug: 29587048

Change-Id: If1aa32291491982851ecd480c4ba8390f39a27a2

btif/src/btif_hf.cc

diff --git a/btif/src/btif_hf.cc b/btif/src/btif_hf.cc
index 6006d6e..8e31c75 100644
--- a/btif/src/btif_hf.cc
+++ b/btif/src/btif_hf.cc
@@ -71,17 +71,16 @@
 #ifndef BTIF_HF_FEATURES
 #define BTIF_HF_FEATURES                                       \
   (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT |  \
-   BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_BTRH |   \
-   BTA_AG_FEAT_VREC | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_HF_IND | \
-   BTA_AG_FEAT_ESCO | BTA_AG_FEAT_UNAT)
+   BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_VREC |   \
+   BTA_AG_FEAT_CODEC | BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO | \
+   BTA_AG_FEAT_UNAT)
 #endif
 #else
 #ifndef BTIF_HF_FEATURES
 #define BTIF_HF_FEATURES                                      \
   (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT | \
-   BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_BTRH |  \
-   BTA_AG_FEAT_VREC | BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO | \
-   BTA_AG_FEAT_UNAT)
+   BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_VREC | \
+   BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO | BTA_AG_FEAT_UNAT)
 #endif
 #endif