system/bt
| Revision | d084b7c9ac2146c97256057b22778204309134fa (tree) |
|---|---|
| Zeit | 2017-04-14 05:05:38 |
| Autor | TreeHugger Robot <treehugger-gerrit@goog...> |
| Commiter | Android (Google) Code Review |
Merge "HFP: Disable BTRH feature" into oc-dev
btif/src/btif_hf.cc (diff)| @@ -71,17 +71,16 @@ | ||
| 71 | 71 | #ifndef BTIF_HF_FEATURES |
| 72 | 72 | #define BTIF_HF_FEATURES \ |
| 73 | 73 | (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT | \ |
| 74 | - BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_BTRH | \ | |
| 75 | - BTA_AG_FEAT_VREC | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_HF_IND | \ | |
| 76 | - BTA_AG_FEAT_ESCO | BTA_AG_FEAT_UNAT) | |
| 74 | + BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_VREC | \ | |
| 75 | + BTA_AG_FEAT_CODEC | BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO | \ | |
| 76 | + BTA_AG_FEAT_UNAT) | |
| 77 | 77 | #endif |
| 78 | 78 | #else |
| 79 | 79 | #ifndef BTIF_HF_FEATURES |
| 80 | 80 | #define BTIF_HF_FEATURES \ |
| 81 | 81 | (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT | \ |
| 82 | - BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_BTRH | \ | |
| 83 | - BTA_AG_FEAT_VREC | BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO | \ | |
| 84 | - BTA_AG_FEAT_UNAT) | |
| 82 | + BTA_AG_FEAT_ECS | BTA_AG_FEAT_EXTERR | BTA_AG_FEAT_VREC | \ | |
| 83 | + BTA_AG_FEAT_HF_IND | BTA_AG_FEAT_ESCO | BTA_AG_FEAT_UNAT) | |
| 85 | 84 | #endif |
| 86 | 85 | #endif |
| 87 | 86 |
Fork