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

Commit 69f20148 authored by Marie Janssen's avatar Marie Janssen
Browse files

jni: use ScopedLocalRef where possible 

RAII simplifies code paths and eliminates errors.

Test: mma -j40, sanity testing on devices

Change-Id: I278f91445217c898a868b8328549c080d7123dbb
parent 02b06696

android/app/jni/com_android_bluetooth.h

+5 −4
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ 
#define COM_ANDROID_BLUETOOTH_H



#include "JNIHelp.h"

#include "jni.h"

#include "hardware/hardware.h"

#include "hardware/bluetooth.h"

#include "utils/Log.h"

#include "android_runtime/AndroidRuntime.h"

#include "android_runtime/Log.h"

#include "hardware/bluetooth.h"

#include "hardware/hardware.h"

#include "jni.h"

#include "nativehelper/ScopedLocalRef.h"

#include "utils/Log.h"



namespace android {

android/app/jni/com_android_bluetooth_a2dp.cpp

+10 −10
Original line number Diff line number Diff line
@@ -39,17 +39,17 @@ static void bta2dp_connection_state_callback(btav_connection_state_t state, 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  jbyteArray addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));

  if (!addr) {

  ScopedLocalRef<jbyteArray> addr(

      sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t)));

  if (!addr.get()) {

    ALOGE("Fail to new jbyteArray bd addr for connection state");

    return;

  }



  sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),

  sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(bt_bdaddr_t),

                                   (jbyte*)bd_addr);

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged,

                               (jint)state, addr);

  sCallbackEnv->DeleteLocalRef(addr);

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

}



static void bta2dp_audio_state_callback(btav_audio_state_t state,
@@ -58,17 +58,17 @@ static void bta2dp_audio_state_callback(btav_audio_state_t state, 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  jbyteArray addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));

  if (!addr) {

  ScopedLocalRef<jbyteArray> addr(

      sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t)));

  if (!addr.get()) {

    ALOGE("Fail to new jbyteArray bd addr for connection state");

    return;

  }



  sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),

  sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(bt_bdaddr_t),

                                   (jbyte*)bd_addr);

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioStateChanged,

                               (jint)state, addr);

  sCallbackEnv->DeleteLocalRef(addr);

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

}



static void bta2dp_audio_config_callback(

android/app/jni/com_android_bluetooth_a2dp_sink.cpp

+17 −16
Original line number Diff line number Diff line
@@ -39,17 +39,17 @@ static void bta2dp_connection_state_callback(btav_connection_state_t state, 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  jbyteArray addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));

  if (!addr) {

  ScopedLocalRef<jbyteArray> addr(

      sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t)));

  if (!addr.get()) {

    ALOGE("Fail to new jbyteArray bd addr for connection state");

    return;

  }



  sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),

  sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(bt_bdaddr_t),

                                   (jbyte*)bd_addr);

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged,

                               (jint)state, addr);

  sCallbackEnv->DeleteLocalRef(addr);

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

}



static void bta2dp_audio_state_callback(btav_audio_state_t state,
@@ -58,17 +58,17 @@ static void bta2dp_audio_state_callback(btav_audio_state_t state, 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  jbyteArray addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));

  if (!addr) {

  ScopedLocalRef<jbyteArray> addr(

      sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t)));

  if (!addr.get()) {

    ALOGE("Fail to new jbyteArray bd addr for connection state");

    return;

  }



  sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),

  sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(bt_bdaddr_t),

                                   (jbyte*)bd_addr);

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioStateChanged,

                               (jint)state, addr);

  sCallbackEnv->DeleteLocalRef(addr);

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

}



static void bta2dp_audio_config_callback(bt_bdaddr_t* bd_addr,
@@ -78,17 +78,18 @@ static void bta2dp_audio_config_callback(bt_bdaddr_t* bd_addr, 
  CallbackEnv sCallbackEnv(__func__);

  if (!sCallbackEnv.valid()) return;



  jbyteArray addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));

  if (!addr) {

  ScopedLocalRef<jbyteArray> addr(

      sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t)));

  if (!addr.get()) {

    ALOGE("Fail to new jbyteArray bd addr for connection state");

    return;

  }



  sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),

  sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(bt_bdaddr_t),

                                   (jbyte*)bd_addr);

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioConfigChanged, addr,

                               (jint)sample_rate, (jint)channel_count);

  sCallbackEnv->DeleteLocalRef(addr);

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioConfigChanged,

                               addr.get(), (jint)sample_rate,

                               (jint)channel_count);

}



static btav_sink_callbacks_t sBluetoothA2dpCallbacks = {

android/app/jni/com_android_bluetooth_avrcp.cpp

+195 −223

File changed.

Preview size limit exceeded, changes collapsed.

android/app/jni/com_android_bluetooth_avrcp_controller.cpp

+198 −176

File changed.

Preview size limit exceeded, changes collapsed.