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

Commit 00bc69f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove flag use_local_oob_extended_command" into main

parents 7c7a573a 58053205

flags/pairing.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -31,16 +31,6 @@ flag { 
    }

}



flag {

    name: "use_local_oob_extended_command"

    namespace: "bluetooth"

    description: "Use HCI Read Local OOB Extended Data command to generate local OOB when Secure Connections is supported by the controller"

    bug: "342250775"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "pairing_name_discovery_addresss_mismatch"

    namespace: "bluetooth"

system/stack/btm/btm_sec.cc

+1 −2
Original line number Diff line number Diff line
@@ -1248,8 +1248,7 @@ void BTM_PasskeyReqReply(tBTM_STATUS res, const RawAddress& bd_addr, uint32_t pa 
 *

 ******************************************************************************/

void BTM_ReadLocalOobData(void) {

  if (com::android::bluetooth::flags::use_local_oob_extended_command() &&

      bluetooth::shim::GetController()->SupportsSecureConnections()) {

  if (bluetooth::shim::GetController()->SupportsSecureConnections()) {

    btsnd_hcic_read_local_oob_extended_data();

  } else {

    btsnd_hcic_read_local_oob_data();