summaryrefslogtreecommitdiff
path: root/system/btif
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-04 17:41:03 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-04 17:41:03 -0800
commitf013ef2c4a3c10751aba5d2067e2f6e5b0e6fdbc (patch)
treec00600a6704c581ba3ef14220b11e3f1d95a5fd1 /system/btif
parentf0905f421166bbfc50ed9cd15d0f75f6c91d6b82 (diff)
parent73d351bd7666a0bf3513fb2343e571a40f5c4feb (diff)
Merge changes Ie3e2608f,Id2f3d731,I77caad08,Ibca250aa,I0aeb6690 into main am: 73d351bd76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3525296 Change-Id: Ib361130d1359109644de34908f008bb548d60696 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'system/btif')
-rw-r--r--system/btif/src/btif_hh.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/system/btif/src/btif_hh.cc b/system/btif/src/btif_hh.cc
index 9bb670a2b2..edc320af85 100644
--- a/system/btif/src/btif_hh.cc
+++ b/system/btif/src/btif_hh.cc
@@ -492,8 +492,7 @@ static bthh_connection_state_t hh_get_state_on_disconnect(tAclLinkSpec& link_spe
static void hh_connect_complete(tBTA_HH_CONN& conn, bthh_connection_state_t state) {
if (state != BTHH_CONN_STATE_CONNECTED) {
- if (!com::android::bluetooth::flags::close_hid_only_if_connected() ||
- conn.status == BTA_HH_OK) {
+ if (conn.status == BTA_HH_OK) {
BTA_HhClose(conn.handle);
}
}