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

Commit cadd13d1 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

IA2: Extract bta gatt client interface am: e5150ed3 am: 442f260e 

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



Change-Id: I1654002b53e50c3ce7d31b6b8dfca4a6f47c60fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1613765e 442f260e

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ filegroup { 
        "dm/bta_dm_api.cc",

        "dm/bta_dm_cfg.cc",

        "dm/bta_dm_ci.cc",

        "dm/bta_dm_gatt_client.cc",

        "dm/bta_dm_main.cc",

        "dm/bta_dm_pm.cc",

    ],

system/bta/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static_library("bta") { 
    "dm/bta_dm_api.cc",

    "dm/bta_dm_cfg.cc",

    "dm/bta_dm_ci.cc",

    "dm/bta_dm_gatt_client.cc",

    "dm/bta_dm_main.cc",

    "dm/bta_dm_pm.cc",

    "gatt/bta_gattc_act.cc",

system/bta/dm/bta_dm_act.cc

+6 −81
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <cstdint>



#include "bta/dm/bta_dm_gatt_client.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/gatt/bta_gattc_int.h"

#include "bta/include/bta_dm_ci.h"
@@ -191,8 +192,6 @@ static uint64_t get_DisableDelayTimerInMs() { 
#endif

}



TimestampedStringCircularBuffer gatt_history_{50};



namespace {



struct WaitForAllAclConnectionsToDrain {
@@ -227,80 +226,6 @@ WaitForAllAclConnectionsToDrain::FromAlarmCallbackData(void* data) { 
      static_cast<WaitForAllAclConnectionsToDrain*>(data));

}



struct gatt_interface_t {

  void (*BTA_GATTC_CancelOpen)(tGATT_IF client_if, const RawAddress& remote_bda,

                               bool is_direct);

  void (*BTA_GATTC_Refresh)(const RawAddress& remote_bda);

  void (*BTA_GATTC_GetGattDb)(uint16_t conn_id, uint16_t start_handle,

                              uint16_t end_handle, btgatt_db_element_t** db,

                              int* count);

  void (*BTA_GATTC_AppRegister)(tBTA_GATTC_CBACK* p_client_cb,

                                BtaAppRegisterCallback cb, bool eatt_support);

  void (*BTA_GATTC_Close)(uint16_t conn_id);

  void (*BTA_GATTC_ServiceSearchRequest)(uint16_t conn_id,

                                         const bluetooth::Uuid* p_srvc_uuid);

  void (*BTA_GATTC_Open)(tGATT_IF client_if, const RawAddress& remote_bda,

                         tBTM_BLE_CONN_TYPE connection_type,

                         bool opportunistic);

} default_gatt_interface = {

    .BTA_GATTC_CancelOpen =

        [](tGATT_IF client_if, const RawAddress& remote_bda, bool is_direct) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s bd_addr:%s client_if:%hu is_direct:%c", "GATTC_CancelOpen",

              ADDRESS_TO_LOGGABLE_CSTR(remote_bda), client_if,

              (is_direct) ? 'T' : 'F'));

          BTA_GATTC_CancelOpen(client_if, remote_bda, is_direct);

        },

    .BTA_GATTC_Refresh =

        [](const RawAddress& remote_bda) {

          gatt_history_.Push(

              base::StringPrintf("%-32s bd_addr:%s", "GATTC_Refresh",

                                 ADDRESS_TO_LOGGABLE_CSTR(remote_bda)));

          BTA_GATTC_Refresh(remote_bda);

        },

    .BTA_GATTC_GetGattDb =

        [](uint16_t conn_id, uint16_t start_handle, uint16_t end_handle,

           btgatt_db_element_t** db, int* count) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s conn_id:%hu start_handle:%hu end:handle:%hu",

              "GATTC_GetGattDb", conn_id, start_handle, end_handle));

          BTA_GATTC_GetGattDb(conn_id, start_handle, end_handle, db, count);

        },

    .BTA_GATTC_AppRegister =

        [](tBTA_GATTC_CBACK* p_client_cb, BtaAppRegisterCallback cb,

           bool eatt_support) {

          gatt_history_.Push(base::StringPrintf("%-32s eatt_support:%c",

                                                "GATTC_AppRegister",

                                                (eatt_support) ? 'T' : 'F'));

          BTA_GATTC_AppRegister(p_client_cb, cb, eatt_support);

        },

    .BTA_GATTC_Close =

        [](uint16_t conn_id) {

          gatt_history_.Push(

              base::StringPrintf("%-32s conn_id:%hu", "GATTC_Close", conn_id));

          BTA_GATTC_Close(conn_id);

        },

    .BTA_GATTC_ServiceSearchRequest =

        [](uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s conn_id:%hu", "GATTC_ServiceSearchRequest", conn_id));

          BTA_GATTC_ServiceSearchRequest(conn_id, p_srvc_uuid);

        },

    .BTA_GATTC_Open =

        [](tGATT_IF client_if, const RawAddress& remote_bda,

           tBTM_BLE_CONN_TYPE connection_type, bool opportunistic) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s bd_addr:%s client_if:%hu type:0x%x opportunistic:%c",

              "GATTC_Open", ADDRESS_TO_LOGGABLE_CSTR(remote_bda), client_if,

              connection_type, (opportunistic) ? 'T' : 'F'));

          BTA_GATTC_Open(client_if, remote_bda, connection_type, opportunistic);

        },

};



gatt_interface_t* gatt_interface = &default_gatt_interface;



gatt_interface_t& get_gatt_interface() { return *gatt_interface; }



}  // namespace



static void bta_dm_reset_sec_dev_pending(const RawAddress& remote_bd_addr);
@@ -4332,7 +4257,7 @@ static void bta_dm_gattc_register(void) { 
  get_gatt_interface().BTA_GATTC_AppRegister(

      bta_dm_gattc_callback, base::Bind([](uint8_t client_id, uint8_t status) {

        tGATT_STATUS gatt_status = static_cast<tGATT_STATUS>(status);

        gatt_history_.Push(base::StringPrintf(

        gatt_history_callback(base::StringPrintf(

            "%-32s client_id:%hu status:%s", "GATTC_RegisteredCallback",

            client_id, gatt_status_text(gatt_status).c_str()));

        if (static_cast<tGATT_STATUS>(status) == GATT_SUCCESS) {
@@ -4486,7 +4411,7 @@ static void bta_dm_proc_open_evt(tBTA_GATTC_OPEN* p_data) { 
  LOG_DEBUG("BTA_GATTC_OPEN_EVT conn_id = %d client_if=%d status = %d",

            p_data->conn_id, p_data->client_if, p_data->status);



  gatt_history_.Push(base::StringPrintf(

  gatt_history_callback(base::StringPrintf(

      "%-32s bd_addr:%s conn_id:%hu client_if:%hu event:%s",

      "GATTC_EventCallback", ADDRESS_TO_LOGGABLE_CSTR(p_data->remote_bda),

      p_data->conn_id, p_data->client_if,
@@ -4507,7 +4432,7 @@ void bta_dm_proc_close_evt(const tBTA_GATTC_CLOSE& close) { 
           ADDRESS_TO_LOGGABLE_CSTR(close.remote_bda),

           gatt_disconnection_reason_text(close.reason).c_str());



  gatt_history_.Push(base::StringPrintf(

  gatt_history_callback(base::StringPrintf(

      "%-32s bd_addr:%s client_if:%hu status:%s event:%s",

      "GATTC_EventCallback", ADDRESS_TO_LOGGABLE_CSTR(close.remote_bda),

      close.client_if, gatt_status_text(close.status).c_str(),
@@ -4721,7 +4646,7 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
                                    p_data->search_cmpl.status);

          break;

      }

      gatt_history_.Push(base::StringPrintf(

      gatt_history_callback(base::StringPrintf(

          "%-32s conn_id:%hu status:%s", "GATTC_EventCallback",

          p_data->search_cmpl.conn_id,

          gatt_status_text(p_data->search_cmpl.status).c_str()));
@@ -4766,7 +4691,7 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
    case BTA_GATTC_SRVC_CHG_EVT:

    case BTA_GATTC_SRVC_DISC_DONE_EVT:

    case BTA_GATTC_SUBRATE_CHG_EVT:

      gatt_history_.Push(

      gatt_history_callback(

          base::StringPrintf("%-32s event:%s", "GATTC_EventCallback",

                             gatt_client_event_text(event).c_str()));

      break;

system/bta/dm/bta_dm_gatt_client.cc

0 → 100644
+123 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "bta/dm/bta_dm_gatt_client.h"



#include <base/strings/stringprintf.h>



#include <cstdint>

#include <cstring>



#include "bta/include/bta_gatt_api.h"

#include "gd/common/strings.h"

#include "osi/include/log.h"

#include "stack/btm/btm_int_types.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



namespace {

TimestampedStringCircularBuffer gatt_history_{50};

constexpr char kTimeFormatString[] = "%Y-%m-%d %H:%M:%S";



constexpr unsigned MillisPerSecond = 1000;

std::string EpochMillisToString(long long time_ms) {

  time_t time_sec = time_ms / MillisPerSecond;

  struct tm tm;

  localtime_r(&time_sec, &tm);

  std::string s = bluetooth::common::StringFormatTime(kTimeFormatString, tm);

  return base::StringPrintf(

      "%s.%03u", s.c_str(),

      static_cast<unsigned int>(time_ms % MillisPerSecond));

}

}  // namespace



gatt_interface_t default_gatt_interface = {

    .BTA_GATTC_CancelOpen =

        [](tGATT_IF client_if, const RawAddress& remote_bda, bool is_direct) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s bd_addr:%s client_if:%hu is_direct:%c", "GATTC_CancelOpen",

              ADDRESS_TO_LOGGABLE_CSTR(remote_bda), client_if,

              (is_direct) ? 'T' : 'F'));

          BTA_GATTC_CancelOpen(client_if, remote_bda, is_direct);

        },

    .BTA_GATTC_Refresh =

        [](const RawAddress& remote_bda) {

          gatt_history_.Push(

              base::StringPrintf("%-32s bd_addr:%s", "GATTC_Refresh",

                                 ADDRESS_TO_LOGGABLE_CSTR(remote_bda)));

          BTA_GATTC_Refresh(remote_bda);

        },

    .BTA_GATTC_GetGattDb =

        [](uint16_t conn_id, uint16_t start_handle, uint16_t end_handle,

           btgatt_db_element_t** db, int* count) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s conn_id:%hu start_handle:%hu end:handle:%hu",

              "GATTC_GetGattDb", conn_id, start_handle, end_handle));

          BTA_GATTC_GetGattDb(conn_id, start_handle, end_handle, db, count);

        },

    .BTA_GATTC_AppRegister =

        [](tBTA_GATTC_CBACK* p_client_cb, BtaAppRegisterCallback cb,

           bool eatt_support) {

          gatt_history_.Push(base::StringPrintf("%-32s eatt_support:%c",

                                                "GATTC_AppRegister",

                                                (eatt_support) ? 'T' : 'F'));

          BTA_GATTC_AppRegister(p_client_cb, cb, eatt_support);

        },

    .BTA_GATTC_Close =

        [](uint16_t conn_id) {

          gatt_history_.Push(

              base::StringPrintf("%-32s conn_id:%hu", "GATTC_Close", conn_id));

          BTA_GATTC_Close(conn_id);

        },

    .BTA_GATTC_ServiceSearchRequest =

        [](uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s conn_id:%hu", "GATTC_ServiceSearchRequest", conn_id));

          BTA_GATTC_ServiceSearchRequest(conn_id, p_srvc_uuid);

        },

    .BTA_GATTC_Open =

        [](tGATT_IF client_if, const RawAddress& remote_bda,

           tBTM_BLE_CONN_TYPE connection_type, bool opportunistic) {

          gatt_history_.Push(base::StringPrintf(

              "%-32s bd_addr:%s client_if:%hu type:0x%x opportunistic:%c",

              "GATTC_Open", ADDRESS_TO_LOGGABLE_CSTR(remote_bda), client_if,

              connection_type, (opportunistic) ? 'T' : 'F'));

          BTA_GATTC_Open(client_if, remote_bda, connection_type, opportunistic);

        },

};



gatt_interface_t* gatt_interface = &default_gatt_interface;



gatt_interface_t& get_gatt_interface() { return *gatt_interface; }



void gatt_history_callback(const std::string entry) {

  gatt_history_.Push(entry);

}



#define DUMPSYS_TAG "shim::legacy::bta::dm"

void DumpsysBtaDmGattClient(int fd) {

  auto gatt_history = gatt_history_.Pull();

  LOG_DUMPSYS(fd, " last %zu gatt history entries", gatt_history.size());

  for (const auto& it : gatt_history) {

    LOG_DUMPSYS(fd, "   %s %s", EpochMillisToString(it.timestamp).c_str(),

                it.entry.c_str());

  }

}

#undef DUMPSYS_TAG



void bluetooth::testing::set_gatt_interface(const gatt_interface_t& interface) {

  *gatt_interface = interface;

}

system/bta/dm/bta_dm_gatt_client.h

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <cstdint>

#include <cstring>



#include "bta/include/bta_gatt_api.h"

#include "include/hardware/bt_common_types.h"

#include "stack/include/btm_ble_api_types.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



//

// Interface as a GATT client for bta clients

//

struct gatt_interface_t {

  void (*BTA_GATTC_CancelOpen)(tGATT_IF client_if, const RawAddress& remote_bda,

                               bool is_direct);

  void (*BTA_GATTC_Refresh)(const RawAddress& remote_bda);

  void (*BTA_GATTC_GetGattDb)(uint16_t conn_id, uint16_t start_handle,

                              uint16_t end_handle, btgatt_db_element_t** db,

                              int* count);

  void (*BTA_GATTC_AppRegister)(tBTA_GATTC_CBACK* p_client_cb,

                                BtaAppRegisterCallback cb, bool eatt_support);

  void (*BTA_GATTC_Close)(uint16_t conn_id);

  void (*BTA_GATTC_ServiceSearchRequest)(uint16_t conn_id,

                                         const bluetooth::Uuid* p_srvc_uuid);

  void (*BTA_GATTC_Open)(tGATT_IF client_if, const RawAddress& remote_bda,

                         tBTM_BLE_CONN_TYPE connection_type,

                         bool opportunistic);

};



//

// Returns the current GATT client interface

//

gatt_interface_t& get_gatt_interface();



//

// Appends a callback entry into GATT client API/callback history

//

void gatt_history_callback(const std::string entry);



//

// Dumps the GATT client API/callback history to dumpsys

//

void DumpsysBtaDmGattClient(int fd);



namespace bluetooth {

namespace testing {



//

// TESTING: Sets a specialzed GATT client interface implementation for testing

//

void set_gatt_interface(const gatt_interface_t& interface);



}  // namespace testing

}  // namespace bluetooth