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

Commit 2fd04b64 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Gerrit Code Review
Browse files

Merge "Wait for pairing before requesting HID connection" into main

parents b6e743e5 3ddfee97

system/btif/src/btif_dm.cc

+3 −1
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <mutex>

#include <mutex>

#include <optional>

#include <optional>





#include <android_bluetooth_flags.h>

#include "advertise_data_parser.h"

#include "advertise_data_parser.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/include/bta_api.h"

#include "bta/include/bta_api.h"
@@ -847,7 +848,8 @@ static void btif_dm_cb_create_bond(const RawAddress bd_addr, 
                       static_cast<tBT_DEVICE_TYPE>(device_type));

                       static_cast<tBT_DEVICE_TYPE>(device_type));

  }

  }





  if (is_hid && (device_type & BT_DEVICE_TYPE_BLE) == 0) {

  if (!IS_FLAG_ENABLED(connect_hid_after_service_discovery) &&

      is_hid && (device_type & BT_DEVICE_TYPE_BLE) == 0) {

    const bt_status_t status =

    const bt_status_t status =

        GetInterfaceToProfiles()->profileSpecific_HACK->btif_hh_connect(

        GetInterfaceToProfiles()->profileSpecific_HACK->btif_hh_connect(

            &bd_addr);

            &bd_addr);