commit f612b732e1119cb72afa595ed5ac820cf65db8ea
author Weichin Weng <weichinweng@google.com> Tue May 07 03:49:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 07 03:49:50 2019 +0000
tree a6ad9d4a44ca85a24ac8affbab7f79a6a3ba1647
parent da0b935bf4d1569a2d42693cc49bba3b60a41e99
parent ee7320a5a15c013f415646a1b58aefdd8045cdb9

Merge "Close unexpected HearingAid open event if is not attempting to connect"

bta/hearing_aid/hearing_aid.cc

diff --git a/bta/hearing_aid/hearing_aid.cc b/bta/hearing_aid/hearing_aid.cc
index b96e45a..4cda26b 100644
--- a/bta/hearing_aid/hearing_aid.cc
+++ b/bta/hearing_aid/hearing_aid.cc
@@ -343,7 +343,11 @@
 
     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;
     }