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

Commit d9e8a89e authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Wait for pairing before requesting HID connection" into main am: 2fd04b64 am: 9f9398a7 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2853667



Change-Id: I86973c9de8f5d81306112b11d6634742de87ea10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a4b0408 9f9398a7

system/btif/src/btif_dm.cc

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

#include <optional>



#include <android_bluetooth_flags.h>

#include "advertise_data_parser.h"

#include "bta/dm/bta_dm_disc.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));

  }



  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 =

        GetInterfaceToProfiles()->profileSpecific_HACK->btif_hh_connect(

            &bd_addr);