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

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

mock: Comment out variables mock::device:: am: e06192d2 am: 8034a316 

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



Change-Id: Ie57bd945d32643c333eac0b3d85df119d5c8daf3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2268aa4f 8034a316

system/test/mock/mock_device_controller.cc

+4 −3
Original line number Diff line number Diff line
@@ -277,15 +277,16 @@ tBTM_STATUS clear_event_filter() { return BTM_SUCCESS; } 


tBTM_STATUS clear_event_mask() { return BTM_SUCCESS; }



tBTM_STATUS le_rand(LeRandCallback cb) { return BTM_SUCCESS; }

tBTM_STATUS le_rand(LeRandCallback /* cb */) { return BTM_SUCCESS; }

tBTM_STATUS set_event_filter_connection_setup_all_devices() {

  return BTM_SUCCESS;

}

tBTM_STATUS set_event_filter_allow_device_connection(

    std::vector<RawAddress> devices) {

    std::vector<RawAddress> /* devices */) {

  return BTM_SUCCESS;

}

tBTM_STATUS set_default_event_mask_except(uint64_t mask, uint64_t le_mask) {

tBTM_STATUS set_default_event_mask_except(uint64_t /* mask */,

                                          uint64_t /* le_mask */) {

  return BTM_SUCCESS;

}

tBTM_STATUS set_event_filter_inquiry_result_all_devices() {

system/test/mock/mock_device_esco_parameters.cc

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec) { 
  return test::mock::device_esco_parameters::esco_parameters_for_codec(codec);

}



enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool b) {

enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool /* b */) {

  inc_func_call_count(__func__);

  return test::mock::device_esco_parameters::esco_parameters_for_codec(codec);

}

system/test/mock/mock_device_esco_parameters.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ namespace device_esco_parameters { 
struct esco_parameters_for_codec {

  enh_esco_params_t return_value{};

  std::function<enh_esco_params_t(esco_codec_t codec)> body{

      [this](esco_codec_t codec) { return return_value; }};

      [this](esco_codec_t /* codec */) { return return_value; }};

  enh_esco_params_t operator()(esco_codec_t codec) { return body(codec); };

};

extern struct esco_parameters_for_codec esco_parameters_for_codec;

system/test/mock/mock_device_interop.h

+60 −59
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ namespace device_interop { 
struct interop_database_add {

  std::function<void(const uint16_t feature, const RawAddress* addr,

                     size_t length)>

      body{

          [](const uint16_t feature, const RawAddress* addr, size_t length) {}};

      body{[](const uint16_t /* feature */, const RawAddress* /* addr */,

              size_t /* length */) {}};

  void operator()(const uint16_t feature, const RawAddress* addr,

                  size_t length) {

    body(feature, addr, length);
@@ -61,8 +61,8 @@ extern struct interop_database_add interop_database_add; 
struct interop_database_add_addr {

  std::function<void(const uint16_t feature, const RawAddress* addr,

                     size_t length)>

      body{

          [](const uint16_t feature, const RawAddress* addr, size_t length) {}};

      body{[](const uint16_t /* feature */, const RawAddress* /* addr */,

              size_t /* length */) {}};

  void operator()(const uint16_t feature, const RawAddress* addr,

                  size_t length) {

    body(feature, addr, length);
@@ -76,8 +76,9 @@ extern struct interop_database_add_addr interop_database_add_addr; 
struct interop_database_add_addr_lmp_version {

  std::function<void(const interop_feature_t feature, const RawAddress* addr,

                     uint8_t lmp_ver, uint16_t lmp_sub_ver)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint8_t lmp_ver, uint16_t lmp_sub_ver) {}};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */, uint8_t /* lmp_ver */,

              uint16_t /* lmp_sub_ver */) {}};

  void operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint8_t lmp_ver, uint16_t lmp_sub_ver) {

    body(feature, addr, lmp_ver, lmp_sub_ver);
@@ -92,8 +93,8 @@ extern struct interop_database_add_addr_lmp_version 
struct interop_database_add_addr_max_lat {

  std::function<void(const interop_feature_t feature, const RawAddress* addr,

                     uint16_t max_lat)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint16_t max_lat) {}};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */, uint16_t /* max_lat */) {}};

  void operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint16_t max_lat) {

    body(feature, addr, max_lat);
@@ -107,7 +108,8 @@ extern struct interop_database_add_addr_max_lat 
// Return: void

struct interop_database_add_manufacturer {

  std::function<void(const interop_feature_t feature, uint16_t manufacturer)>

      body{[](const interop_feature_t feature, uint16_t manufacturer) {}};

      body{[](const interop_feature_t /* feature */,

              uint16_t /* manufacturer */) {}};

  void operator()(const interop_feature_t feature, uint16_t manufacturer) {

    body(feature, manufacturer);

  };
@@ -120,7 +122,7 @@ extern struct interop_database_add_manufacturer 
// Return: void

struct interop_database_add_name {

  std::function<void(const uint16_t feature, const char* name)> body{

      [](const uint16_t feature, const char* name) {}};

      [](const uint16_t /* feature */, const char* /* name */) {}};

  void operator()(const uint16_t feature, const char* name) {

    body(feature, name);

  };
@@ -132,7 +134,7 @@ extern struct interop_database_add_name interop_database_add_name; 
// Return: void

struct interop_database_add_version {

  std::function<void(const interop_feature_t feature, uint16_t version)> body{

      [](const interop_feature_t feature, uint16_t version) {}};

      [](const interop_feature_t /* feature */, uint16_t /* version */) {}};

  void operator()(const interop_feature_t feature, uint16_t version) {

    body(feature, version);

  };
@@ -145,8 +147,8 @@ extern struct interop_database_add_version interop_database_add_version; 
struct interop_database_add_vndr_prdt {

  std::function<void(const interop_feature_t feature, uint16_t vendor_id,

                     uint16_t product_id)>

      body{[](const interop_feature_t feature, uint16_t vendor_id,

              uint16_t product_id) {}};

      body{[](const interop_feature_t /* feature */, uint16_t /* vendor_id */,

              uint16_t /* product_id */) {}};

  void operator()(const interop_feature_t feature, uint16_t vendor_id,

                  uint16_t product_id) {

    body(feature, vendor_id, product_id);
@@ -169,9 +171,8 @@ extern struct interop_database_clear interop_database_clear; 
struct interop_database_match_addr {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr)>

      body{[](const interop_feature_t feature, const RawAddress* addr) {

        return return_value;

      }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr) {

    return body(feature, addr);

  };
@@ -185,9 +186,9 @@ struct interop_database_match_addr_get_lmp_ver { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr,

                     uint8_t* lmp_ver, uint16_t* lmp_sub_ver)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint8_t* lmp_ver,

              uint16_t* lmp_sub_ver) { return return_value; }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */, uint8_t* /* lmp_ver */,

              uint16_t* /* lmp_sub_ver */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint8_t* lmp_ver, uint16_t* lmp_sub_ver) {

    return body(feature, addr, lmp_ver, lmp_sub_ver);
@@ -203,8 +204,9 @@ struct interop_database_match_addr_get_max_lat { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr,

                     uint16_t* max_lat)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint16_t* max_lat) { return return_value; }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */,

              uint16_t* /* max_lat */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint16_t* max_lat) {

    return body(feature, addr, max_lat);
@@ -219,9 +221,8 @@ extern struct interop_database_match_addr_get_max_lat 
struct interop_database_match_manufacturer {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t manufacturer)>

      body{[](const interop_feature_t feature, uint16_t manufacturer) {

        return return_value;

      }};

      body{[](const interop_feature_t /* feature */,

              uint16_t /* manufacturer */) { return return_value; }};

  bool operator()(const interop_feature_t feature, uint16_t manufacturer) {

    return body(feature, manufacturer);

  };
@@ -235,7 +236,7 @@ extern struct interop_database_match_manufacturer 
struct interop_database_match_name {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, const char* name)> body{

      [](const interop_feature_t feature, const char* name) {

      [](const interop_feature_t /* feature */, const char* /* name */) {

        return return_value;

      }};

  bool operator()(const interop_feature_t feature, const char* name) {
@@ -250,7 +251,7 @@ extern struct interop_database_match_name interop_database_match_name; 
struct interop_database_match_version {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t version)> body{

      [](const interop_feature_t feature, uint16_t version) {

      [](const interop_feature_t /* feature */, uint16_t /* version */) {

        return return_value;

      }};

  bool operator()(const interop_feature_t feature, uint16_t version) {
@@ -266,8 +267,8 @@ struct interop_database_match_vndr_prdt { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t vendor_id,

                     uint16_t product_id)>

      body{[](const interop_feature_t feature, uint16_t vendor_id,

              uint16_t product_id) { return return_value; }};

      body{[](const interop_feature_t /* feature */, uint16_t /* vendor_id */,

              uint16_t /* product_id */) { return return_value; }};

  bool operator()(const interop_feature_t feature, uint16_t vendor_id,

                  uint16_t product_id) {

    return body(feature, vendor_id, product_id);
@@ -281,9 +282,8 @@ extern struct interop_database_match_vndr_prdt interop_database_match_vndr_prdt; 
struct interop_database_remove_addr {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr)>

      body{[](const interop_feature_t feature, const RawAddress* addr) {

        return return_value;

      }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr) {

    return body(feature, addr);

  };
@@ -297,8 +297,9 @@ struct interop_database_remove_addr_lmp_version { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr,

                     uint8_t lmp_ver, uint16_t lmp_sub_ver)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint8_t lmp_ver, uint16_t lmp_sub_ver) { return return_value; }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */, uint8_t /* lmp_ver */,

              uint16_t /* lmp_sub_ver */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint8_t lmp_ver, uint16_t lmp_sub_ver) {

    return body(feature, addr, lmp_ver, lmp_sub_ver);
@@ -314,8 +315,9 @@ struct interop_database_remove_addr_max_lat { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr,

                     uint16_t max_lat)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint16_t max_lat) { return return_value; }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */,

              uint16_t /* max_lat */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint16_t max_lat) {

    return body(feature, addr, max_lat);
@@ -330,7 +332,7 @@ extern struct interop_database_remove_addr_max_lat 
struct interop_database_remove_feature {

  static bool return_value;

  std::function<bool(const interop_feature_t feature)> body{

      [](const interop_feature_t feature) { return return_value; }};

      [](const interop_feature_t /* feature */) { return return_value; }};

  bool operator()(const interop_feature_t feature) { return body(feature); };

};

extern struct interop_database_remove_feature interop_database_remove_feature;
@@ -341,9 +343,8 @@ extern struct interop_database_remove_feature interop_database_remove_feature; 
struct interop_database_remove_manufacturer {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t manufacturer)>

      body{[](const interop_feature_t feature, uint16_t manufacturer) {

        return return_value;

      }};

      body{[](const interop_feature_t /* feature */,

              uint16_t /* manufacturer */) { return return_value; }};

  bool operator()(const interop_feature_t feature, uint16_t manufacturer) {

    return body(feature, manufacturer);

  };
@@ -357,7 +358,7 @@ extern struct interop_database_remove_manufacturer 
struct interop_database_remove_name {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, const char* name)> body{

      [](const interop_feature_t feature, const char* name) {

      [](const interop_feature_t /* feature */, const char* /* name */) {

        return return_value;

      }};

  bool operator()(const interop_feature_t feature, const char* name) {
@@ -372,7 +373,7 @@ extern struct interop_database_remove_name interop_database_remove_name; 
struct interop_database_remove_version {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t version)> body{

      [](const interop_feature_t feature, uint16_t version) {

      [](const interop_feature_t /* feature */, uint16_t /* version */) {

        return return_value;

      }};

  bool operator()(const interop_feature_t feature, uint16_t version) {
@@ -388,8 +389,8 @@ struct interop_database_remove_vndr_prdt { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t vendor_id,

                     uint16_t product_id)>

      body{[](const interop_feature_t feature, uint16_t vendor_id,

              uint16_t product_id) { return return_value; }};

      body{[](const interop_feature_t /* feature */, uint16_t /* vendor_id */,

              uint16_t /* product_id */) { return return_value; }};

  bool operator()(const interop_feature_t feature, uint16_t vendor_id,

                  uint16_t product_id) {

    return body(feature, vendor_id, product_id);
@@ -404,7 +405,7 @@ extern struct interop_database_remove_vndr_prdt 
struct interop_feature_name_to_feature_id {

  static int return_value;

  std::function<int(const char* feature_name)> body{

      [](const char* feature_name) { return return_value; }};

      [](const char* /* feature_name */) { return return_value; }};

  int operator()(const char* feature_name) { return body(feature_name); };

};

extern struct interop_feature_name_to_feature_id
@@ -416,7 +417,7 @@ extern struct interop_feature_name_to_feature_id 
struct interop_get_allowlisted_media_players_list {

  static bool return_value;

  std::function<bool(list_t* p_bl_devices)> body{

      [](list_t* p_bl_devices) { return return_value; }};

      [](list_t* /* p_bl_devices */) { return return_value; }};

  bool operator()(list_t* p_bl_devices) { return body(p_bl_devices); };

};

extern struct interop_get_allowlisted_media_players_list
@@ -428,9 +429,8 @@ extern struct interop_get_allowlisted_media_players_list 
struct interop_match_addr {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr)>

      body{[](const interop_feature_t feature, const RawAddress* addr) {

        return return_value;

      }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr) {

    return body(feature, addr);

  };
@@ -444,8 +444,9 @@ struct interop_match_addr_get_max_lat { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, const RawAddress* addr,

                     uint16_t* max_lat)>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              uint16_t* max_lat) { return return_value; }};

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */,

              uint16_t* /* max_lat */) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr,

                  uint16_t* max_lat) {

    return body(feature, addr, max_lat);
@@ -461,8 +462,9 @@ struct interop_match_addr_or_name { 
  std::function<bool(const interop_feature_t feature, const RawAddress* addr,

                     bt_status_t (*get_remote_device_property)(

                         const RawAddress*, bt_property_t*))>

      body{[](const interop_feature_t feature, const RawAddress* addr,

              bt_status_t (*get_remote_device_property)(

      body{[](const interop_feature_t /* feature */,

              const RawAddress* /* addr */,

              bt_status_t (* /* get_remote_device_property */)(

                  const RawAddress*, bt_property_t*)) { return return_value; }};

  bool operator()(const interop_feature_t feature, const RawAddress* addr,

                  bt_status_t (*get_remote_device_property)(const RawAddress*,
@@ -478,9 +480,8 @@ extern struct interop_match_addr_or_name interop_match_addr_or_name; 
struct interop_match_manufacturer {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t manufacturer)>

      body{[](const interop_feature_t feature, uint16_t manufacturer) {

        return return_value;

      }};

      body{[](const interop_feature_t /* feature */,

              uint16_t /* manufacturer */) { return return_value; }};

  bool operator()(const interop_feature_t feature, uint16_t manufacturer) {

    return body(feature, manufacturer);

  };
@@ -493,7 +494,7 @@ extern struct interop_match_manufacturer interop_match_manufacturer; 
struct interop_match_name {

  static bool return_value;

  std::function<bool(const interop_feature_t feature, const char* name)> body{

      [](const interop_feature_t feature, const char* name) {

      [](const interop_feature_t /* feature */, const char* /* name */) {

        return return_value;

      }};

  bool operator()(const interop_feature_t feature, const char* name) {
@@ -509,8 +510,8 @@ struct interop_match_vendor_product_ids { 
  static bool return_value;

  std::function<bool(const interop_feature_t feature, uint16_t vendor_id,

                     uint16_t product_id)>

      body{[](const interop_feature_t feature, uint16_t vendor_id,

              uint16_t product_id) { return return_value; }};

      body{[](const interop_feature_t /* feature */, uint16_t /* vendor_id */,

              uint16_t /* product_id */) { return return_value; }};

  bool operator()(const interop_feature_t feature, uint16_t vendor_id,

                  uint16_t product_id) {

    return body(feature, vendor_id, product_id);
@@ -524,7 +525,7 @@ extern struct interop_match_vendor_product_ids interop_match_vendor_product_ids; 
struct token_to_ul {

  static bool return_value;

  std::function<bool(char* token, uint16_t* ul)> body{

      [](char* token, uint16_t* ul) { return return_value; }};

      [](char* /* token */, uint16_t* /* ul */) { return return_value; }};

  bool operator()(char* token, uint16_t* ul) { return body(token, ul); };

};

extern struct token_to_ul token_to_ul;

system/test/mock/mock_device_iot_config.h

+35 −28

File changed.

Preview size limit exceeded, changes collapsed.