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

Commit d02482c2 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I8175344d,Ic26c9b03 into main 

* changes:
  cpplint: fix and enable readability/check
  cpplint: fix and enable whitespace/blank_line
parents b0c53a10 55ae2902

CPPLINT.cfg

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ linelength=100 
# CPPLint enforces +1, but our rule is no indentation.

filter=-whitespace/indent



# TODO: b/364967694 re-enable the warning

filter=-whitespace/blank_line

# TODO: b/364967694 re-enable the warning

filter=-readability/check

# TODO: b/364967694 re-enable the warning

filter=-runtime/int

# TODO: b/364967694 re-enable the warning

system/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ TEST_F(AudioA2dpHwTest, test_compute_buffer_size) { 
        }



        uint32_t sample_rate = codec_sample_rate2value(codec_sample_rate);

        EXPECT_TRUE(sample_rate != 0);

        EXPECT_NE(0u, sample_rate);



        uint32_t bits_per_sample = codec_bits_per_sample2value(codec_bits_per_sample);

        EXPECT_TRUE(bits_per_sample != 0);

        EXPECT_NE(0u, bits_per_sample);



        uint32_t number_of_channels = codec_channel_mode2value(codec_channel_mode);

        EXPECT_TRUE(number_of_channels != 0);

        EXPECT_NE(0u, number_of_channels);



        const uint64_t time_period_ms = 20;  // TODO: Must be a parameter

        size_t expected_buffer_size = (time_period_ms * AUDIO_STREAM_OUTPUT_BUFFER_PERIODS *

system/bta/csis/csis_client_test.cc

+1 −2
Original line number Diff line number Diff line
@@ -841,8 +841,7 @@ TEST_F(CsisClientTest, test_get_group_id) { 
  EXPECT_CALL(*callbacks, OnDeviceAvailable(test_address, _, _, _, _));

  InjectConnectedEvent(test_address, 1);

  GetSearchCompleteEvent(1);

  int group_id = CsisClient::Get()->GetGroupId(test_address);

  ASSERT_TRUE(group_id == 1);

  ASSERT_EQ(1, CsisClient::Get()->GetGroupId(test_address));

  TestAppUnregister();

}

system/bta/dm/bta_dm_disc_sdp.cc

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ void bta_dm_sdp_result(tSDP_STATUS sdp_result, tBTA_DM_SDP_STATE* sdp_state) { 
      } else { /* regular one service per search or PNP search */

        break;

      }



    } while (sdp_state->service_index <= BTA_MAX_SERVICE_ID);



    log::verbose("services_found = {:04x}", sdp_state->services_found);

system/bta/dm/bta_dm_int.h

+0 −7
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ typedef struct { 
                              app_id, bta_sys_conn_status_text(state).c_str(),

                              new_request ? "true" : "false");

  }



} tBTA_DM_SRVCS;



#ifndef BTA_DM_NUM_CONN_SRVS
@@ -196,7 +195,6 @@ typedef struct { 
typedef struct {

  uint8_t count;

  tBTA_DM_SRVCS conn_srvc[BTA_DM_NUM_CONN_SRVS];



} tBTA_DM_CONNECTED_SRVCS;



typedef struct {
@@ -257,7 +255,6 @@ typedef struct { 
  uint16_t page_timeout; /* timeout for page in slots */

  bool avoid_scatter;    /* true to avoid scatternet when av is streaming (be the

                            central) */



} tBTA_DM_CFG;



extern const uint32_t bta_service_id_to_btm_srv_id_lkup_tbl[];
@@ -266,7 +263,6 @@ typedef struct { 
  uint8_t id;

  uint8_t app_id;

  uint8_t cfg;



} tBTA_DM_RM;



extern const tBTA_DM_CFG* p_bta_dm_cfg;
@@ -276,20 +272,17 @@ typedef struct { 
  uint8_t id;

  uint8_t app_id;

  uint8_t spec_idx; /* index of spec table to use */



} tBTA_DM_PM_CFG;



typedef struct {

  tBTA_DM_PM_ACTION power_mode;

  uint16_t timeout;



} tBTA_DM_PM_ACTN;



typedef struct {

  uint8_t allow_mask; /* mask of sniff/hold/park modes to allow */

  uint8_t ssr;        /* set SSR on conn open/unpark */

  tBTA_DM_PM_ACTN actn_tbl[BTA_DM_PM_NUM_EVTS][2];



} tBTA_DM_PM_SPEC;



typedef struct {