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

Commit 08fe23f8 authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Removing flag connect_hid_after_service_discovery

Test: mmm packages/modules/Bluetooth
Flag: com.android.bluetooth.flags.connect_hid_after_service_discovery
Bug: 314707251
Change-Id: I68a306465baf4af54dfce6a8b5ce9fa3695f4c6c
parent 4c835a93
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ flag {
    bug: "311196228"
}

flag {
    name: "connect_hid_after_service_discovery"
    namespace: "bluetooth"
    description: "Don't initiate HID connection before pairing and service discovery"
    bug: "314707251"
}

flag {
    name: "bta_dm_disc_stuck_in_cancelling_fix"
    namespace: "bluetooth"
+1 −14
Original line number Diff line number Diff line
@@ -854,20 +854,7 @@ static void btif_dm_cb_create_bond(const RawAddress bd_addr,
                       static_cast<tBT_DEVICE_TYPE>(device_type));
  }

  if (!com::android::bluetooth::flags::connect_hid_after_service_discovery() &&
      is_hid && (device_type & BT_DEVICE_TYPE_BLE) == 0) {
    tAclLinkSpec link_spec;
    link_spec.addrt.bda = bd_addr;
    link_spec.addrt.type = addr_type;
    link_spec.transport = transport;
    const bt_status_t status =
        GetInterfaceToProfiles()->profileSpecific_HACK->btif_hh_connect(
            link_spec);
    if (status != BT_STATUS_SUCCESS)
      bond_state_changed(status, bd_addr, BT_BOND_STATE_NONE);
  } else {
  BTA_DmBond(bd_addr, addr_type, transport, device_type);
  }
  /*  Track  originator of bond creation  */
  pairing_cb.is_local_initiated = true;
}