From d59d54fb0d92da99a731c5efe70c1549d1d47745 Mon Sep 17 00:00:00 2001 From: weichinweng Date: Sat, 4 May 2019 08:49:24 +0800 Subject: [PATCH] Close unexpected HearingAid open event if is not attempting to connect When HearingAid bta layer receive unexpected HearingAid open event, should close it if is not attempting to connect. Bug: 131863877 Test: 1.Forget/Repair HearingAid device from Bluetooth UI. 2.Disconnect/Reconnect HearingAid device from Bluetooth UI. 3.HearingAid device power off/on, check them can reconnect. Change-Id: I75d63d0441dcc6b7338b1e30453021eb271f4872 Merged-In: I75d63d0441dcc6b7338b1e30453021eb271f4872 --- bta/hearing_aid/hearing_aid.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bta/hearing_aid/hearing_aid.cc b/bta/hearing_aid/hearing_aid.cc index 28b69d23a..8f74f6549 100644 --- a/bta/hearing_aid/hearing_aid.cc +++ b/bta/hearing_aid/hearing_aid.cc @@ -343,7 +343,11 @@ class HearingAidImpl : public HearingAid { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - DVLOG(2) << "Skipping unknown device, address=" << address; + /* When Hearing Aid is quickly disabled and enabled in settings, this case + * might happen */ + LOG(WARNING) << "Closing connection to non hearing-aid device, address=" + << address; + BTA_GATTC_Close(conn_id); return; } -- 2.11.0