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

Commit 1eec9fee authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes I21eec4ea,I29482a84,I020564e4,Ie8daf0e6 into main 

* changes:
  system: Remove unnecessary calls to std::to_string in fmt arguments
  system: Remove explicit formatting of boolean values
  system: Strip unnecessary () around fmt arguments
  system: Replace loghex by {:x} in log calls
parents 99e098b0 f5ceef3a

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+6 −9
Original line number Diff line number Diff line
@@ -307,9 +307,8 @@ static void device_found_callback(int num_properties, 
    return;

  }



  log::verbose(

      "Properties: {}, Address: {}", num_properties,

      ADDRESS_TO_LOGGABLE_STR(*(RawAddress*)properties[addr_index].val));

  log::verbose("Properties: {}, Address: {}", num_properties,

               *(RawAddress*)properties[addr_index].val);



  remote_device_properties_callback(BT_STATUS_SUCCESS,

                                    (RawAddress*)properties[addr_index].val,
@@ -745,8 +744,7 @@ static void switch_buffer_size_callback(bool is_low_latency_buffer_size) { 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  log::verbose("SwitchBufferSizeCallback: {}",

               is_low_latency_buffer_size ? "true" : "false");

  log::verbose("SwitchBufferSizeCallback: {}", is_low_latency_buffer_size);



  sCallbackEnv->CallVoidMethod(

      sJniCallbacksObj, method_switchBufferSizeCallback,
@@ -763,8 +761,7 @@ static void switch_codec_callback(bool is_low_latency_buffer_size) { 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  log::verbose("SwitchCodecCallback: {}",

               is_low_latency_buffer_size ? "true" : "false");

  log::verbose("SwitchCodecCallback: {}", is_low_latency_buffer_size);



  sCallbackEnv->CallVoidMethod(sJniCallbacksObj, method_switchCodecCallback,

                               (jboolean)is_low_latency_buffer_size);

android/app/jni/com_android_bluetooth_hearing_aid.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class HearingAidCallbacksImpl : public HearingAidCallbacks { 


  void OnDeviceAvailable(uint8_t capabilities, uint64_t hi_sync_id,

                         const RawAddress& bd_addr) override {

    log::info("capabilities={} hi_sync_id={}", +capabilities, hi_sync_id);

    log::info("capabilities={} hi_sync_id={}", capabilities, hi_sync_id);



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);

android/app/jni/com_android_bluetooth_hfp.cpp

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks { 
  void ConnectionStateCallback(

      bluetooth::headset::bthf_connection_state_t state,

      RawAddress* bd_addr) override {

    log::info("{} for {}", state, ADDRESS_TO_LOGGABLE_CSTR(*bd_addr));

    log::info("{} for {}", state, *bd_addr);



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);
@@ -95,7 +95,7 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks { 


  void AudioStateCallback(bluetooth::headset::bthf_audio_state_t state,

                          RawAddress* bd_addr) override {

    log::info("{} for {}", state, ADDRESS_TO_LOGGABLE_CSTR(*bd_addr));

    log::info("{} for {}", state, *bd_addr);



    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);

    CallbackEnv sCallbackEnv(__func__);
@@ -503,7 +503,7 @@ static jboolean connectHfpNative(JNIEnv* env, jobject /* object */, 
    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }

  log::info("device {}", ADDRESS_TO_LOGGABLE_CSTR(*((RawAddress*)addr)));

  log::info("device {}", *((RawAddress*)addr));

  bt_status_t status = sBluetoothHfpInterface->Connect((RawAddress*)addr);

  if (status != BT_STATUS_SUCCESS) {

    log::error("Failed HF connection, status: {}", bt_status_text(status));
@@ -525,7 +525,7 @@ static jboolean disconnectHfpNative(JNIEnv* env, jobject /* object */, 
    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }

  log::info("device {}", ADDRESS_TO_LOGGABLE_CSTR(*((RawAddress*)addr)));

  log::info("device {}", *((RawAddress*)addr));

  bt_status_t status = sBluetoothHfpInterface->Disconnect((RawAddress*)addr);

  if (status != BT_STATUS_SUCCESS) {

    log::error("Failed HF disconnection, status: {}", bt_status_text(status));
@@ -547,7 +547,7 @@ static jboolean connectAudioNative(JNIEnv* env, jobject /* object */, 
    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }

  log::info("device {}", ADDRESS_TO_LOGGABLE_CSTR(*((RawAddress*)addr)));

  log::info("device {}", *((RawAddress*)addr));

  bt_status_t status =

      sBluetoothHfpInterface->ConnectAudio((RawAddress*)addr, 0);

  if (status != BT_STATUS_SUCCESS) {
@@ -571,7 +571,7 @@ static jboolean disconnectAudioNative(JNIEnv* env, jobject /* object */, 
    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }

  log::info("device {}", ADDRESS_TO_LOGGABLE_CSTR(*((RawAddress*)addr)));

  log::info("device {}", *((RawAddress*)addr));

  bt_status_t status =

      sBluetoothHfpInterface->DisconnectAudio((RawAddress*)addr);

  if (status != BT_STATUS_SUCCESS) {

android/app/jni/com_android_bluetooth_hfpclient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void callsetup_cb(const RawAddress* bd_addr, 
  ScopedLocalRef<jbyteArray> addr(sCallbackEnv.get(), marshall_bda(bd_addr));

  if (!addr.get()) return;



  log::debug("callsetup_cb bdaddr {}", ADDRESS_TO_LOGGABLE_STR(*bd_addr));

  log::debug("callsetup_cb bdaddr {}", *bd_addr);



  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onCallSetup,

                               (jint)callsetup, addr.get());

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);

  }