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

Commit 6cca4fc0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GATT: Use BT_TRANSPORT_LE when address type is Random" am: 73c62fd5 am: a68b8e1b 

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



Change-Id: I1dd6509ec519ba60fc2fa3bf6619a28186651b14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9c222d3 a68b8e1b

system/btif/src/btif_gatt_client.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -339,7 +339,7 @@ void btif_gattc_open_impl(int client_if, RawAddress address, bool is_direct, 
        break;

        break;





      case BT_DEVICE_TYPE_DUMO:

      case BT_DEVICE_TYPE_DUMO:

        if (transport_p == BT_TRANSPORT_LE)

        if (addr_type == BLE_ADDR_RANDOM)

          transport = BT_TRANSPORT_LE;

          transport = BT_TRANSPORT_LE;

        else

        else

          transport = BT_TRANSPORT_BR_EDR;

          transport = BT_TRANSPORT_BR_EDR;
@@ -348,8 +348,8 @@ void btif_gattc_open_impl(int client_if, RawAddress address, bool is_direct, 
  }

  }





  // Connect!

  // Connect!

  BTIF_TRACE_DEBUG("%s Transport=%d, device type=%d, phy=%d", __func__,

  LOG_INFO("%s Transport=%d, device type=%d, address type =%d, phy=%d",

                   transport, device_type, initiating_phys);

           __func__, transport, device_type, addr_type, initiating_phys);

  BTA_GATTC_Open(client_if, address, is_direct, transport, opportunistic,

  BTA_GATTC_Open(client_if, address, is_direct, transport, opportunistic,

                 initiating_phys);

                 initiating_phys);

}

}