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

Commit e3599819 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "Convert leftover ALOGx macros in HFP JNI" into main am: a4d8b874 am: 65cdb1c5 

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



Change-Id: Ifc9d40166908e92761ed82ce0b7b6bddb256b0ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0271acbe 65cdb1c5

android/app/jni/com_android_bluetooth_hfp.cpp

+6 −5
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#define LOG_TAG "BluetoothHeadsetServiceJni"



#include <bluetooth/log.h>



#include <mutex>

#include <shared_mutex>
@@ -24,7 +26,6 @@ 
#include "hardware/bluetooth_headset_callbacks.h"

#include "hardware/bluetooth_headset_interface.h"

#include "hardware/bt_hf.h"

#include "os/log.h"



namespace android {
@@ -948,22 +949,22 @@ static jboolean enableSwbNative(JNIEnv* env, jobject /* object */, jint swbCodec 
                                jbyteArray address) {

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

  if (!sBluetoothHfpInterface) {

    ALOGW("%s: sBluetoothHfpInterface is null", __func__);

    log::warn("sBluetoothHfpInterface is null");

    return JNI_FALSE;

  }

  jbyte* addr = env->GetByteArrayElements(address, NULL);

  if (!addr) {

    ALOGE("%s: failed to get device address", __func__);

    log::error("failed to get device address");

    jniThrowIOException(env, EINVAL);

    return JNI_FALSE;

  }

  bt_status_t ret = sBluetoothHfpInterface->EnableSwb(

          (bluetooth::headset::bthf_swb_codec_t)swbCodec, (bool)enable, (RawAddress*)addr);

  if (ret != BT_STATUS_SUCCESS) {

    ALOGE("%s: Failed to %s", __func__, (enable ? "enable" : "disable"));

    log::error("Failed to {}", (enable ? "enable" : "disable"));

    return JNI_FALSE;

  }

  ALOGV("%s: Successfully %s", __func__, (enable ? "enabled" : "disabled"));

  log::verbose("Successfully {}", (enable ? "enabled" : "disabled"));

  return JNI_TRUE;

}