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

Commit 9452b2ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "system/stack/test: Fix -Wmissing-prototype warnings" into main am: 57f1201c am: 2fff2e52 

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



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

system/stack/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -1255,7 +1255,6 @@ cc_test { 
        "avdt/avdt_l2c.cc",

        "avdt/avdt_scb.cc",

        "avdt/avdt_scb_act.cc",

        "test/common/mock_btu_layer.cc",

        "test/common/mock_stack_avdt_msg.cc",

        "test/stack_avdtp_test.cc",

    ],
@@ -1626,7 +1625,6 @@ cc_test { 
        ":TestMockStackL2capInterface",

        ":TestStubOsi",

        "eatt/eatt.cc",

        "test/common/mock_btif_storage.cc",

        "test/common/mock_btm_api_layer.cc",

        "test/common/mock_gatt_layer.cc",

        "test/common/mock_l2cap_layer.cc",

system/stack/test/a2dp/mock_bta_av_codec.cc

+1 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */



#include "a2dp_codec_api.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"

#include "btif/include/btif_av_co.h"



A2dpCodecConfig* bta_av_get_a2dp_current_codec(void) { return nullptr; }

system/stack/test/btm/stack_btm_inq_test.cc

+3 −5
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#include "test/mock/mock_main_shim_entry.h"

#include "types/raw_address.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



extern tBTM_CB btm_cb;



using bluetooth::common::ContextualCallback;
@@ -129,11 +126,12 @@ public: 


MockBtmInquiryCallbacks* inquiry_callback_ptr = nullptr;



void btm_inq_results_cb(tBTM_INQ_RESULTS* p_inq_results, const uint8_t* p_eir, uint16_t eir_len) {

static void btm_inq_results_cb(tBTM_INQ_RESULTS* p_inq_results, const uint8_t* p_eir,

                               uint16_t eir_len) {

  inquiry_callback_ptr->btm_inq_results_cb(p_inq_results, p_eir, eir_len);

}



void btm_inq_cmpl_cb(void* p1) { inquiry_callback_ptr->btm_inq_cmpl_cb(p1); }

static void btm_inq_cmpl_cb(void* p1) { inquiry_callback_ptr->btm_inq_cmpl_cb(p1); }



class BtmDeviceInquiryTest : public BtmInqTest {

protected:

system/stack/test/btm_iso_test.cc

+6 −8
Original line number Diff line number Diff line
@@ -27,14 +27,12 @@ 
#include "stack/btm/btm_dev.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hcidefs.h"

#include "test/mock/mock_main_shim_entry.h"

#include "test/mock/mock_main_shim_hci_layer.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using bluetooth::hci::IsoManager;

using testing::_;

using testing::AnyNumber;
@@ -448,13 +446,13 @@ protected: 
  void CleanupIsoManager() override { /* DO NOTHING */ }

};



bool operator==(const EXT_CIS_CFG& x, const EXT_CIS_CFG& y) {

static bool operator==(const EXT_CIS_CFG& x, const EXT_CIS_CFG& y) {

  return (x.cis_id == y.cis_id) && (x.max_sdu_size_mtos == y.max_sdu_size_mtos) &&

         (x.max_sdu_size_stom == y.max_sdu_size_stom) && (x.phy_mtos == y.phy_mtos) &&

         (x.phy_stom == y.phy_stom) && (x.rtn_mtos == y.rtn_mtos) && (x.rtn_stom == y.rtn_stom);

}



bool operator==(const struct bluetooth::hci::iso_manager::cig_create_params& x,

static bool operator==(const struct bluetooth::hci::iso_manager::cig_create_params& x,

                       const struct bluetooth::hci::iso_manager::cig_create_params& y) {

  return (x.sdu_itv_mtos == y.sdu_itv_mtos) && (x.sdu_itv_stom == y.sdu_itv_stom) &&

         (x.sca == y.sca) && (x.packing == y.packing) && (x.framing == y.framing) &&
@@ -463,7 +461,7 @@ bool operator==(const struct bluetooth::hci::iso_manager::cig_create_params& x, 
         std::is_permutation(x.cis_cfgs.begin(), x.cis_cfgs.end(), y.cis_cfgs.begin());

}



bool operator==(const struct bluetooth::hci::iso_manager::big_create_params& x,

static bool operator==(const struct bluetooth::hci::iso_manager::big_create_params& x,

                       const struct bluetooth::hci::iso_manager::big_create_params& y) {

  return (x.adv_handle == y.adv_handle) && (x.num_bis == y.num_bis) && (x.sdu_itv == y.sdu_itv) &&

         (x.max_sdu_size == y.max_sdu_size) &&

system/stack/test/common/mock_btif_storage.cc

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2020 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 "mock_btif_storage.h"



#include "stack/include/btm_sec_api_types.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



static bluetooth::manager::MockBtifStorageInterface* btif_storage_interface = nullptr;



void bluetooth::manager::SetMockBtifStorageInterface(

        MockBtifStorageInterface* mock_btif_storage_interface) {

  btif_storage_interface = mock_btif_storage_interface;

}



void btif_storage_load_bonded_eatt(void) { btif_storage_interface->LoadBondedEatt(); }