Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438a3cca authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

HOGP should not request GATT connection when already connected 

HOGP host requests GATT to connect again to the device when the
connection is considered completed. Normally, this request does not have
any effect since connection manager ignores it as the device is already
connected. However, when the remote device uses RPA with random static
address as identity address, connection manager may get confused. In
such cases, connection manager may end up adding the device in the
acceptlist.

Test: mma packages/modules/Bluetooth
Test: Manual | Reconnect with paired HOGP devices
Bug: 328248863
Bug: 329720661
Change-Id: Ie0757b6cfa0b296065604f9cb1339edac2f837ef
parent 0a90b382

system/bta/hh/bta_hh_le.cc

+7 −4
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ using bluetooth::Uuid; 
using std::vector;

using namespace bluetooth;



/* TODO: b/329720661 Remove this namespace entirely when

 * prevent_hogp_reconnect_when_connected flag is shipped */

namespace {



#ifndef BTA_HH_LE_RECONN

constexpr bool kBTA_HH_LE_RECONN = true;

#else

constexpr bool kBTA_HH_LE_RECONN = false;

#endif



}  // namespace



#define BTA_HH_APP_ID_LE 0xff
@@ -642,9 +642,12 @@ static void bta_hh_le_open_cmpl(tBTA_HH_DEV_CB* p_cb) { 
    bta_hh_le_register_input_notif(p_cb, p_cb->mode, true);

    bta_hh_sm_execute(p_cb, BTA_HH_OPEN_CMPL_EVT, NULL);



    if (!IS_FLAG_ENABLED(prevent_hogp_reconnect_when_connected)) {

      if (kBTA_HH_LE_RECONN && p_cb->status == BTA_HH_OK) {

        bta_hh_le_add_dev_bg_conn(p_cb);

      }

      return;

    }

  }

}