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

Commit 78df7c6e authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes I2ff8cf4b,I71342aaf into main am: 7745538e am: bf9240bc 

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



Change-Id: I5bc5c42264e9929f86e3027a56f4b53204d0548c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4df413f9 bf9240bc

Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ cc_defaults { 
        "-Wall",

        "-Werror",

        "-Wextra",

        // there are too many unused parameters in all the code.

        "-Wno-unused-parameter",

    ],

    c_std: "c99",

    cpp_std: "c++17",

android/app/jni/com_android_bluetooth_BluetoothQualityReport.cpp

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void initNative(JNIEnv* env, jobject object) { 
  sBluetoothQualityReportInterface->init(&sBluetoothQualityReportCallbacks);

}



static void cleanupNative(JNIEnv* env, jobject object) {

static void cleanupNative(JNIEnv* env, jobject /* object */) {

  std::unique_lock<std::shared_timed_mutex> interface_lock(interface_mutex);

  std::unique_lock<std::shared_timed_mutex> callbacks_lock(callbacks_mutex);

android/app/jni/com_android_bluetooth_a2dp.cpp

+7 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static std::shared_timed_mutex callbacks_mutex; 


static void bta2dp_connection_state_callback(const RawAddress& bd_addr,

                                             btav_connection_state_t state,

                                             const btav_error_t& error) {

                                             const btav_error_t& /* error */) {

  ALOGI("%s", __func__);



  std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);
@@ -192,7 +192,7 @@ static btav_source_callbacks_t sBluetoothA2dpCallbacks = { 
};



static std::vector<btav_a2dp_codec_config_t> prepareCodecPreferences(

    JNIEnv* env, jobject object, jobjectArray codecConfigArray) {

    JNIEnv* env, jobject /* object */, jobjectArray codecConfigArray) {

  std::vector<btav_a2dp_codec_config_t> codec_preferences;



  int numConfigs = env->GetArrayLength(codecConfigArray);
@@ -305,7 +305,7 @@ static void initNative(JNIEnv* env, jobject object, 
  }

}



static void cleanupNative(JNIEnv* env, jobject object) {

static void cleanupNative(JNIEnv* env, jobject /* object */) {

  std::unique_lock<std::shared_timed_mutex> interface_lock(interface_mutex);

  std::unique_lock<std::shared_timed_mutex> callbacks_lock(callbacks_mutex);
@@ -329,7 +329,7 @@ static void cleanupNative(JNIEnv* env, jobject object) { 
  }

}



static jboolean connectA2dpNative(JNIEnv* env, jobject object,

static jboolean connectA2dpNative(JNIEnv* env, jobject /* object */,

                                  jbyteArray address) {

  ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);
@@ -354,7 +354,7 @@ static jboolean connectA2dpNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static jboolean disconnectA2dpNative(JNIEnv* env, jobject object,

static jboolean disconnectA2dpNative(JNIEnv* env, jobject /* object */,

                                     jbyteArray address) {

  ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);
@@ -379,7 +379,7 @@ static jboolean disconnectA2dpNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static jboolean setSilenceDeviceNative(JNIEnv* env, jobject object,

static jboolean setSilenceDeviceNative(JNIEnv* env, jobject /* object */,

                                       jbyteArray address, jboolean silence) {

  ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);

  std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);
@@ -406,7 +406,7 @@ static jboolean setSilenceDeviceNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static jboolean setActiveDeviceNative(JNIEnv* env, jobject object,

static jboolean setActiveDeviceNative(JNIEnv* env, jobject /* object */,

                                      jbyteArray address) {

  ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);

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

android/app/jni/com_android_bluetooth_a2dp_sink.cpp

+9 −9
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ static const btav_sink_interface_t* sBluetoothA2dpInterface = NULL; 
static jobject mCallbacksObj = NULL;

static std::shared_timed_mutex callbacks_mutex;



static void a2dp_sink_connection_state_callback(const RawAddress& bd_addr,

                                                btav_connection_state_t state,

                                                const btav_error_t& error) {

static void a2dp_sink_connection_state_callback(

    const RawAddress& bd_addr, btav_connection_state_t state,

    const btav_error_t& /* error */) {

  ALOGI("%s", __func__);

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

  if (!mCallbacksObj) return;
@@ -151,7 +151,7 @@ static void initNative(JNIEnv* env, jobject object, 
  mCallbacksObj = env->NewGlobalRef(object);

}



static void cleanupNative(JNIEnv* env, jobject object) {

static void cleanupNative(JNIEnv* env, jobject /* object */) {

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

  const bt_interface_t* btInf = getBluetoothInterface();
@@ -171,7 +171,7 @@ static void cleanupNative(JNIEnv* env, jobject object) { 
  }

}



static jboolean connectA2dpNative(JNIEnv* env, jobject object,

static jboolean connectA2dpNative(JNIEnv* env, jobject /* object */,

                                  jbyteArray address) {

  ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);

  if (!sBluetoothA2dpInterface) return JNI_FALSE;
@@ -192,7 +192,7 @@ static jboolean connectA2dpNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static jboolean disconnectA2dpNative(JNIEnv* env, jobject object,

static jboolean disconnectA2dpNative(JNIEnv* env, jobject /* object */,

                                     jbyteArray address) {

  if (!sBluetoothA2dpInterface) return JNI_FALSE;
@@ -212,19 +212,19 @@ static jboolean disconnectA2dpNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static void informAudioFocusStateNative(JNIEnv* env, jobject object,

static void informAudioFocusStateNative(JNIEnv* /* env */, jobject /* object */,

                                        jint focus_state) {

  if (!sBluetoothA2dpInterface) return;

  sBluetoothA2dpInterface->set_audio_focus_state((uint8_t)focus_state);

}



static void informAudioTrackGainNative(JNIEnv* env, jobject object,

static void informAudioTrackGainNative(JNIEnv* /* env */, jobject /* object */,

                                       jfloat gain) {

  if (!sBluetoothA2dpInterface) return;

  sBluetoothA2dpInterface->set_audio_track_gain((float)gain);

}



static jboolean setActiveDeviceNative(JNIEnv* env, jobject object,

static jboolean setActiveDeviceNative(JNIEnv* env, jobject /* object */,

                                      jbyteArray address) {

  if (!sBluetoothA2dpInterface) return JNI_FALSE;

android/app/jni/com_android_bluetooth_avrcp_controller.cpp

+30 −30
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ static const btrc_ctrl_interface_t* sBluetoothAvrcpInterface = NULL; 
static jobject sCallbacksObj = NULL;

static std::shared_timed_mutex sCallbacks_mutex;



static void btavrcp_passthrough_response_callback(const RawAddress& bd_addr,

                                                  int id, int pressed) {

static void btavrcp_passthrough_response_callback(

    const RawAddress& /* bd_addr */, int id, int pressed) {

  ALOGV("%s: id: %d, pressed: %d --- Not implemented", __func__, id, pressed);

}
@@ -86,19 +86,19 @@ static void btavrcp_connection_state_callback(bool rc_connect, bool br_connect, 
                               addr.get());

}



static void btavrcp_get_rcfeatures_callback(const RawAddress& bd_addr,

                                            int features) {

static void btavrcp_get_rcfeatures_callback(const RawAddress& /* bd_addr */,

                                            int /* features */) {

  ALOGV("%s --- Not implemented", __func__);

}

static void btavrcp_setplayerapplicationsetting_rsp_callback(

    const RawAddress& bd_addr, uint8_t accepted) {

    const RawAddress& /* bd_addr */, uint8_t /* accepted */) {

  ALOGV("%s --- Not implemented", __func__);

}



static void btavrcp_playerapplicationsetting_callback(

    const RawAddress& bd_addr, uint8_t num_attr,

    btrc_player_app_attr_t* app_attrs, uint8_t num_ext_attr,

    btrc_player_app_ext_attr_t* ext_attrs) {

    btrc_player_app_attr_t* app_attrs, uint8_t /* num_ext_attr */,

    btrc_player_app_ext_attr_t* /* ext_attrs */) {

  ALOGI("%s", __func__);

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

  CallbackEnv sCallbackEnv(__func__);
@@ -768,7 +768,7 @@ static void initNative(JNIEnv* env, jobject object) { 
  sCallbacksObj = env->NewGlobalRef(object);

}



static void cleanupNative(JNIEnv* env, jobject object) {

static void cleanupNative(JNIEnv* env, jobject /* object */) {

  std::unique_lock<std::shared_timed_mutex> lock(sCallbacks_mutex);



  const bt_interface_t* btInf = getBluetoothInterface();
@@ -788,7 +788,7 @@ static void cleanupNative(JNIEnv* env, jobject object) { 
  }

}



static jboolean sendPassThroughCommandNative(JNIEnv* env, jobject object,

static jboolean sendPassThroughCommandNative(JNIEnv* env, jobject /* object */,

                                             jbyteArray address, jint key_code,

                                             jint key_state) {

  if (!sBluetoothAvrcpInterface) return JNI_FALSE;
@@ -815,7 +815,8 @@ static jboolean sendPassThroughCommandNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static jboolean sendGroupNavigationCommandNative(JNIEnv* env, jobject object,

static jboolean sendGroupNavigationCommandNative(JNIEnv* env,

                                                 jobject /* object */,

                                                 jbyteArray address,

                                                 jint key_code,

                                                 jint key_state) {
@@ -843,11 +844,9 @@ static jboolean sendGroupNavigationCommandNative(JNIEnv* env, jobject object, 
  return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

}



static void setPlayerApplicationSettingValuesNative(JNIEnv* env, jobject object,

                                                    jbyteArray address,

                                                    jbyte num_attrib,

                                                    jbyteArray attrib_ids,

                                                    jbyteArray attrib_val) {

static void setPlayerApplicationSettingValuesNative(

    JNIEnv* env, jobject /* object */, jbyteArray address, jbyte num_attrib,

    jbyteArray attrib_ids, jbyteArray attrib_val) {

  ALOGI("%s: sBluetoothAvrcpInterface: %p", __func__, sBluetoothAvrcpInterface);

  if (!sBluetoothAvrcpInterface) return;
@@ -894,8 +893,8 @@ static void setPlayerApplicationSettingValuesNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void sendAbsVolRspNative(JNIEnv* env, jobject object, jbyteArray address,

                                jint abs_vol, jint label) {

static void sendAbsVolRspNative(JNIEnv* env, jobject /* object */,

                                jbyteArray address, jint abs_vol, jint label) {

  if (!sBluetoothAvrcpInterface) return;



  jbyte* addr = env->GetByteArrayElements(address, NULL);
@@ -916,7 +915,7 @@ static void sendAbsVolRspNative(JNIEnv* env, jobject object, jbyteArray address, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void sendRegisterAbsVolRspNative(JNIEnv* env, jobject object,

static void sendRegisterAbsVolRspNative(JNIEnv* env, jobject /* object */,

                                        jbyteArray address, jbyte rsp_type,

                                        jint abs_vol, jint label) {

  if (!sBluetoothAvrcpInterface) return;
@@ -940,7 +939,7 @@ static void sendRegisterAbsVolRspNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void getCurrentMetadataNative(JNIEnv* env, jobject object,

static void getCurrentMetadataNative(JNIEnv* env, jobject /* object */,

                                     jbyteArray address) {

  if (!sBluetoothAvrcpInterface) return;
@@ -961,7 +960,7 @@ static void getCurrentMetadataNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void getPlaybackStateNative(JNIEnv* env, jobject object,

static void getPlaybackStateNative(JNIEnv* env, jobject /* object */,

                                   jbyteArray address) {

  if (!sBluetoothAvrcpInterface) return;
@@ -982,7 +981,7 @@ static void getPlaybackStateNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void getNowPlayingListNative(JNIEnv* env, jobject object,

static void getNowPlayingListNative(JNIEnv* env, jobject /* object */,

                                    jbyteArray address, jint start, jint end) {

  if (!sBluetoothAvrcpInterface) return;

  jbyte* addr = env->GetByteArrayElements(address, NULL);
@@ -1002,8 +1001,8 @@ static void getNowPlayingListNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void getFolderListNative(JNIEnv* env, jobject object, jbyteArray address,

                                jint start, jint end) {

static void getFolderListNative(JNIEnv* env, jobject /* object */,

                                jbyteArray address, jint start, jint end) {

  if (!sBluetoothAvrcpInterface) return;

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

  if (!addr) {
@@ -1022,8 +1021,8 @@ static void getFolderListNative(JNIEnv* env, jobject object, jbyteArray address, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void getPlayerListNative(JNIEnv* env, jobject object, jbyteArray address,

                                jint start, jint end) {

static void getPlayerListNative(JNIEnv* env, jobject /* object */,

                                jbyteArray address, jint start, jint end) {

  if (!sBluetoothAvrcpInterface) return;

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

  if (!addr) {
@@ -1042,7 +1041,7 @@ static void getPlayerListNative(JNIEnv* env, jobject object, jbyteArray address, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void changeFolderPathNative(JNIEnv* env, jobject object,

static void changeFolderPathNative(JNIEnv* env, jobject /* object */,

                                   jbyteArray address, jbyte direction,

                                   jlong uid) {

  if (!sBluetoothAvrcpInterface) return;
@@ -1070,7 +1069,7 @@ static void changeFolderPathNative(JNIEnv* env, jobject object, 
  // env->ReleaseByteArrayElements(address, addr, 0);

}



static void setBrowsedPlayerNative(JNIEnv* env, jobject object,

static void setBrowsedPlayerNative(JNIEnv* env, jobject /* object */,

                                   jbyteArray address, jint id) {

  if (!sBluetoothAvrcpInterface) return;

  jbyte* addr = env->GetByteArrayElements(address, NULL);
@@ -1090,7 +1089,7 @@ static void setBrowsedPlayerNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void setAddressedPlayerNative(JNIEnv* env, jobject object,

static void setAddressedPlayerNative(JNIEnv* env, jobject /* object */,

                                     jbyteArray address, jint id) {

  if (!sBluetoothAvrcpInterface) return;

  jbyte* addr = env->GetByteArrayElements(address, NULL);
@@ -1111,8 +1110,9 @@ static void setAddressedPlayerNative(JNIEnv* env, jobject object, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void playItemNative(JNIEnv* env, jobject object, jbyteArray address,

                           jbyte scope, jlong uid, jint uidCounter) {

static void playItemNative(JNIEnv* env, jobject /* object */,

                           jbyteArray address, jbyte scope, jlong uid,

                           jint uidCounter) {

  if (!sBluetoothAvrcpInterface) return;

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

  if (!addr) {