summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-08-29 21:51:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-29 21:51:21 +0000
commitfb309b3ce796efd9c2747d8209d113191c618193 (patch)
treef5a656e01a760ca280ef499ecc1c4b4f2cd60070
parent5274ab7a31055865be100753f26de56119886d3f (diff)
parentd2a37effc254ef0ffef6068fddad13466cc92358 (diff)
downloadandroid-system-bt-fb309b3ce796efd9c2747d8209d113191c618193.tar.gz
android-system-bt-fb309b3ce796efd9c2747d8209d113191c618193.tar.xz
Merge "Disable auto-pairing for hands-free devices" into nyc-dev
-rw-r--r--btif/src/btif_dm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index c47909f..b1ad00b 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -923,7 +923,6 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ *p_pin_req)
if (pairing_cb.is_local_initiated && (p_pin_req->min_16_digit == FALSE))
{
if (check_cod(&bd_addr, COD_AV_HEADSETS) ||
- check_cod(&bd_addr, COD_AV_HANDSFREE) ||
check_cod(&bd_addr, COD_AV_HEADPHONES) ||
check_cod(&bd_addr, COD_AV_PORTABLE_AUDIO) ||
check_cod(&bd_addr, COD_AV_HIFI_AUDIO) ||