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

Commit 2a6826d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove flag pairing_on_unknown_transport" into main am: 2dfe0ab4 

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



Change-Id: Ia31af3e6b43a217c36d40dde913aba5e87b026a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bfb7d267 2dfe0ab4

flags/pairing.aconfig

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

}



flag {

    name: "pairing_on_unknown_transport"

    namespace: "bluetooth"

    description: "Allow pairing on transport not known to be supported by the remote device"

    bug: "335239971"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "cancel_pairing_only_on_disconnected_transport"

    namespace: "bluetooth"

system/stack/btm/btm_sec.cc

+0 −3
Original line number Diff line number Diff line
@@ -826,9 +826,6 @@ tBTM_STATUS BTM_SecBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
  if ((transport == BT_TRANSPORT_LE && (dev_type & BT_DEVICE_TYPE_BLE) == 0) ||

      (transport == BT_TRANSPORT_BR_EDR && (dev_type & BT_DEVICE_TYPE_BREDR) == 0)) {

    log::warn("Requested transport and supported transport don't match");

    if (!com::android::bluetooth::flags::pairing_on_unknown_transport()) {

      return tBTM_STATUS::BTM_ILLEGAL_ACTION;

    }

  }

  return btm_sec_bond_by_transport(bd_addr, addr_type, transport);

}