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

Commit e7fa676b authored by Grzegorz Kołodziejczyk's avatar Grzegorz Kołodziejczyk Committed by Jakub Pawlowski
Browse files

leaudio: Remove not needed flags from group status 

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: atest BluetoothInstrumentationTests

Change-Id: Ic972c89333337310b296488e4371ee9190cce45d
parent ce9dd85b

android/app/jni/com_android_bluetooth_le_audio.cpp

+3 −5
Original line number Original line Diff line number Diff line
@@ -68,8 +68,7 @@ class LeAudioClientCallbacksImpl : public LeAudioClientCallbacks { 
                                 (jint)state, addr.get());

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

  }

  }





  void OnGroupStatus(uint8_t group_id, GroupStatus group_status,

  void OnGroupStatus(int group_id, GroupStatus group_status) override {

                     uint8_t group_flags) override {

    LOG(INFO) << __func__;

    LOG(INFO) << __func__;





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

    std::shared_lock<std::shared_timed_mutex> lock(callbacks_mutex);
@@ -77,8 +76,7 @@ class LeAudioClientCallbacksImpl : public LeAudioClientCallbacks { 
    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) return;

    if (!sCallbackEnv.valid() || mCallbacksObj == nullptr) return;





    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onGroupStatus,

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onGroupStatus,

                                 (jint)group_id, (jint)group_status,

                                 (jint)group_id, (jint)group_status);

                                 (jint)group_flags);

  }

  }





  void OnAudioConf(uint8_t direction, int group_id,

  void OnAudioConf(uint8_t direction, int group_id,
@@ -100,7 +98,7 @@ class LeAudioClientCallbacksImpl : public LeAudioClientCallbacks { 
static LeAudioClientCallbacksImpl sLeAudioClientCallbacks;

static LeAudioClientCallbacksImpl sLeAudioClientCallbacks;





static void classInitNative(JNIEnv* env, jclass clazz) {

static void classInitNative(JNIEnv* env, jclass clazz) {

  method_onGroupStatus = env->GetMethodID(clazz, "onGroupStatus", "(III)V");

  method_onGroupStatus = env->GetMethodID(clazz, "onGroupStatus", "(II)V");

  method_onAudioConf = env->GetMethodID(clazz, "onAudioConf", "(IIIII)V");

  method_onAudioConf = env->GetMethodID(clazz, "onAudioConf", "(IIIII)V");

  method_onConnectionStateChanged =

  method_onConnectionStateChanged =

      env->GetMethodID(clazz, "onConnectionStateChanged", "(I[B)V");

      env->GetMethodID(clazz, "onConnectionStateChanged", "(I[B)V");

android/app/src/com/android/bluetooth/le_audio/LeAudioNativeInterface.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -99,13 +99,11 @@ public class LeAudioNativeInterface { 
        sendMessageToService(event);

        sendMessageToService(event);

    }

    }





    private void onGroupStatus(int groupId, int groupStatus, int groupFlags) {

    private void onGroupStatus(int groupId, int groupStatus) {

        LeAudioStackEvent event =

        LeAudioStackEvent event =

                new LeAudioStackEvent(LeAudioStackEvent.EVENT_TYPE_GROUP_STATUS_CHANGED);

                new LeAudioStackEvent(LeAudioStackEvent.EVENT_TYPE_GROUP_STATUS_CHANGED);

        event.valueInt1 = groupId;

        event.valueInt1 = groupId;

        event.valueInt2 = groupStatus;

        event.valueInt2 = groupStatus;

        event.valueInt3 = groupFlags;

        event.device = null;





        if (DBG) {

        if (DBG) {

            Log.d(TAG, "onGroupStatus: " + event);

            Log.d(TAG, "onGroupStatus: " + event);