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

Commit 8ff7c7c1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11526283 from 6330ce35 to 24Q2-release 

Change-Id: I9d3bfbb9a63b57570f5bf105b066cbcf99dcd6a8
parents 10230fa6 6330ce35

system/bta/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -1053,8 +1053,8 @@ cc_test { 
    srcs: [

        ":TestCommonMockFunctions",

        ":TestCommonStackConfig",

        ":TestMockMainShim",

        "le_audio/broadcaster/broadcaster_types.cc",

        "le_audio/broadcaster/mock_ble_advertising_manager.cc",

        "le_audio/broadcaster/state_machine.cc",

        "le_audio/broadcaster/state_machine_test.cc",

        "le_audio/le_audio_types.cc",
@@ -1072,11 +1072,14 @@ cc_test { 
        "libbluetooth_gd",

        "libbluetooth_log",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libchrome",

        "libflatbuffers-cpp",

        "libgmock",

        "liblc3",

        "libosi",

    ],

    sanitize: {

        cfi: true,
@@ -1114,7 +1117,6 @@ cc_test { 
        "le_audio/broadcaster/broadcaster.cc",

        "le_audio/broadcaster/broadcaster_test.cc",

        "le_audio/broadcaster/broadcaster_types.cc",

        "le_audio/broadcaster/mock_ble_advertising_manager.cc",

        "le_audio/broadcaster/mock_state_machine.cc",

        "le_audio/content_control_id_keeper.cc",

        "le_audio/le_audio_types.cc",

system/bta/hearing_aid/hearing_aid_audio_source.cc

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ using namespace bluetooth; 


namespace fmt {

template <>

struct formatter<bt_status_t> : enum_formatter<bt_status_t> {};

template <>

struct formatter<tUIPC_EVENT> : enum_formatter<tUIPC_EVENT> {};

template <>

struct formatter<tHEARING_AID_CTRL_ACK>

system/bta/include/bta_api.h

+2 −0
Original line number Diff line number Diff line
@@ -974,6 +974,8 @@ void DumpsysBtaDm(int fd); 
namespace fmt {

template <>

struct formatter<tBTA_DM_SEARCH_EVT> : enum_formatter<tBTA_DM_SEARCH_EVT> {};

template <>

struct formatter<tBTA_DM_ACL_EVT> : enum_formatter<tBTA_DM_ACL_EVT> {};

}  // namespace fmt



#endif /* BTA_API_H */

system/bta/include/bta_api_data_types.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#pragma once



#include <base/strings/stringprintf.h>

#include <bluetooth/log.h>



#include <cstdint>

#include <string>
@@ -61,3 +62,8 @@ typedef struct { 
typedef struct {

  RawAddress bd_addr;

} tBTA_DM_KEY_MISSING;



namespace fmt {

template <>

struct formatter<tBTA_STATUS> : enum_formatter<tBTA_STATUS> {};

}  // namespace fmt

system/bta/include/bta_sec_api.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <base/functional/callback.h>

#include <base/strings/stringprintf.h>

#include <bluetooth/log.h>



#include <cstdint>
@@ -495,3 +496,8 @@ void BTA_DmSirkSecCbRegister(tBTA_DM_SEC_CBACK* p_cback); 
 *

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

void BTA_DmSirkConfirmDeviceReply(const RawAddress& bd_addr, bool accept);



namespace fmt {

template <>

struct formatter<tBTA_DM_SEC_EVT> : enum_formatter<tBTA_DM_SEC_EVT> {};

}  // namespace fmt