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

Commit 684ea28b authored by Henri Chataing's avatar Henri Chataing
Browse files

system: Strip unnecessary () around fmt arguments 

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I020564e4975bdcf6a23f70e7e0f789ddeddc3cbc
parent f274f083

system/audio_hal_interface/aidl/client_interface_aidl.cc

+6 −6
Original line number Diff line number Diff line
@@ -561,8 +561,8 @@ size_t BluetoothAudioSinkClientInterface::ReadAudioData(uint8_t* p_buf, 
      timeout_ms -= kDefaultDataReadPollIntervalMs;

      continue;

    } else {

      log::warn("{}/{} no data {} ms", (len - total_read), len,

                (kDefaultDataReadTimeoutMs - timeout_ms));

      log::warn("{}/{} no data {} ms", len - total_read, len,

                kDefaultDataReadTimeoutMs - timeout_ms);

      break;

    }

  } while (total_read < len);
@@ -571,7 +571,7 @@ size_t BluetoothAudioSinkClientInterface::ReadAudioData(uint8_t* p_buf, 
          (kDefaultDataReadTimeoutMs - kDefaultDataReadPollIntervalMs) &&

      timeout_ms >= kDefaultDataReadPollIntervalMs) {

    log::verbose("underflow {} -> {} read {} ms", len, total_read,

                 (kDefaultDataReadTimeoutMs - timeout_ms));

                 kDefaultDataReadTimeoutMs - timeout_ms);

  } else {

    log::verbose("{} -> {} read", len, total_read);

  }
@@ -625,8 +625,8 @@ size_t BluetoothAudioSourceClientInterface::WriteAudioData(const uint8_t* p_buf, 
      timeout_ms -= kDefaultDataWritePollIntervalMs;

      continue;

    } else {

      log::warn("{}/{} no data {} ms", (len - total_written), len,

                (kDefaultDataWriteTimeoutMs - timeout_ms));

      log::warn("{}/{} no data {} ms", len - total_written, len,

                kDefaultDataWriteTimeoutMs - timeout_ms);

      break;

    }

  } while (total_written < len);
@@ -635,7 +635,7 @@ size_t BluetoothAudioSourceClientInterface::WriteAudioData(const uint8_t* p_buf, 
          (kDefaultDataWriteTimeoutMs - kDefaultDataWritePollIntervalMs) &&

      timeout_ms >= kDefaultDataWritePollIntervalMs) {

    log::verbose("underflow {} -> {} read {} ms", len, total_written,

                 (kDefaultDataWriteTimeoutMs - timeout_ms));

                 kDefaultDataWriteTimeoutMs - timeout_ms);

  } else {

    log::verbose("{} -> {} written", len, total_written);

  }

system/audio_hal_interface/hidl/client_interface_hidl.cc

+6 −6
Original line number Diff line number Diff line
@@ -784,8 +784,8 @@ size_t BluetoothAudioSinkClientInterface::ReadAudioData(uint8_t* p_buf, 
      timeout_ms -= kDefaultDataReadPollIntervalMs;

      continue;

    } else {

      log::warn("{}/{} no data {} ms", (len - total_read), len,

                (kDefaultDataReadTimeoutMs - timeout_ms));

      log::warn("{}/{} no data {} ms", len - total_read, len,

                kDefaultDataReadTimeoutMs - timeout_ms);

      break;

    }

  } while (total_read < len);
@@ -794,7 +794,7 @@ size_t BluetoothAudioSinkClientInterface::ReadAudioData(uint8_t* p_buf, 
          (kDefaultDataReadTimeoutMs - kDefaultDataReadPollIntervalMs) &&

      timeout_ms >= kDefaultDataReadPollIntervalMs) {

    log::verbose("underflow {} -> {} read {} ms", len, total_read,

                 (kDefaultDataReadTimeoutMs - timeout_ms));

                 kDefaultDataReadTimeoutMs - timeout_ms);

  } else {

    log::verbose("{} -> {} read", len, total_read);

  }
@@ -859,8 +859,8 @@ size_t BluetoothAudioSourceClientInterface::WriteAudioData(const uint8_t* p_buf, 
      timeout_ms -= kDefaultDataWritePollIntervalMs;

      continue;

    } else {

      log::warn("{}/{} no data {} ms", (len - total_written), len,

                (kDefaultDataWriteTimeoutMs - timeout_ms));

      log::warn("{}/{} no data {} ms", len - total_written, len,

                kDefaultDataWriteTimeoutMs - timeout_ms);

      break;

    }

  } while (total_written < len);
@@ -869,7 +869,7 @@ size_t BluetoothAudioSourceClientInterface::WriteAudioData(const uint8_t* p_buf, 
          (kDefaultDataWriteTimeoutMs - kDefaultDataWritePollIntervalMs) &&

      timeout_ms >= kDefaultDataWritePollIntervalMs) {

    log::verbose("underflow {} -> {} read {} ms", len, total_written,

                 (kDefaultDataWriteTimeoutMs - timeout_ms));

                 kDefaultDataWriteTimeoutMs - timeout_ms);

  } else {

    log::verbose("{} -> {} written", len, total_written);

  }

system/bta/csis/csis_client.cc

+2 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ class CsisClientImpl : public CsisClient { 
  void CsisLockCompleted(std::shared_ptr<CsisGroup>& csis_group, bool lock,

                         CsisGroupLockStatus status) {

    log::debug("group id: {}, target state {}", csis_group->GetGroupId(),

               (lock ? "lock" : "unlock"));

               lock ? "lock" : "unlock");



    NotifyGroupStatus(csis_group->GetGroupId(), lock, status,

                      std::move(csis_group->GetLockCb()));
@@ -1246,7 +1246,7 @@ class CsisClientImpl : public CsisClient { 


#ifdef CSIS_DEBUG

    auto irk = BTM_BleGetPeerIRK(address);

    log::info("LTK {}", (base::HexEncode(*pltk.data(), 16)));

    log::info("LTK {}", base::HexEncode(*pltk.data(), 16));

    log::info("IRK {}", base::HexEncode(*irk.data(), 16));

#endif

system/bta/dm/bta_dm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, 
  }



  log::debug("Encrypted:{:c}, peer:{} transport:{} status:{} callback:{:c}",

             result == BTM_SUCCESS ? 'T' : 'F', (*bd_addr),

             result == BTM_SUCCESS ? 'T' : 'F', *bd_addr,

             bt_transport_text(transport), btm_status_text(result),

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

system/bta/hearing_aid/hearing_aid.cc

+3 −3
Original line number Diff line number Diff line
@@ -943,9 +943,9 @@ class HearingAidImpl : public HearingAid { 
    bool side = capabilities & CAPABILITY_SIDE;

    bool standalone = capabilities & CAPABILITY_BINAURAL;

    bool csis_capable = capabilities & CAPABILITY_CSIS;

    log::debug("capabilities: {}, {}, CSIS {}", (side ? "right" : "left"),

               (standalone ? "binaural" : "monaural"),

               (csis_capable ? "capable" : "not capable"));

    log::debug("capabilities: {}, {}, CSIS {}", side ? "right" : "left",

               standalone ? "binaural" : "monaural",

               csis_capable ? "capable" : "not capable");



    if (capabilities & CAPABILITY_RESERVED) {

      log::warn("reserved capabilities are set");