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

Commit 1767bad7 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes I65903cec,I729afc60 

* changes:
  leaudio: Implement missing function
  leaudio: remove not used group status
parents 53e458f3 332d67b1

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

+1 −8
Original line number Diff line number Diff line
@@ -821,12 +821,6 @@ public class LeAudioService extends ProfileService { 
            int group_status = stackEvent.valueInt2;



            switch (group_status) {

                case LeAudioStackEvent.GROUP_STATUS_IDLE:

                case LeAudioStackEvent.GROUP_STATUS_RECONFIGURED:

                case LeAudioStackEvent.GROUP_STATUS_DESTROYED:

                case LeAudioStackEvent.GROUP_STATUS_SUSPENDED:

                case LeAudioStackEvent.GROUP_STATUS_STREAMING:

                    break;

                case LeAudioStackEvent.GROUP_STATUS_ACTIVE: {

                    LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);

                    if (descriptor != null) {
@@ -1150,8 +1144,7 @@ public class LeAudioService extends ProfileService { 
        if (device == null) {

            return LE_AUDIO_GROUP_ID_INVALID;

        }

        //TODO: implement

        return LE_AUDIO_GROUP_ID_INVALID;

        return mDeviceGroupIdMap.getOrDefault(device, LE_AUDIO_GROUP_ID_INVALID);

    }



    /**

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

+1 −16
Original line number Diff line number Diff line
@@ -40,13 +40,8 @@ public class LeAudioStackEvent { 
    static final int CONNECTION_STATE_CONNECTED = 2;

    static final int CONNECTION_STATE_DISCONNECTING = 3;



    static final int GROUP_STATUS_IDLE = 0;

    static final int GROUP_STATUS_INACTIVE = 0;

    static final int GROUP_STATUS_ACTIVE = 1;

    static final int GROUP_STATUS_INACTIVE = 2;

    static final int GROUP_STATUS_STREAMING = 3;

    static final int GROUP_STATUS_SUSPENDED = 4;

    static final int GROUP_STATUS_RECONFIGURED = 5;

    static final int GROUP_STATUS_DESTROYED = 6;



    static final int GROUP_NODE_ADDED = 1;

    static final int GROUP_NODE_REMOVED = 2;
@@ -127,20 +122,10 @@ public class LeAudioStackEvent { 
        switch (type) {

            case EVENT_TYPE_GROUP_STATUS_CHANGED:

                switch (value) {

                    case GROUP_STATUS_IDLE:

                        return "GROUP_STATUS_IDLE";

                    case GROUP_STATUS_ACTIVE:

                        return "GROUP_STATUS_ACTIVE";

                    case GROUP_STATUS_INACTIVE:

                        return "GROUP_STATUS_INACTIVE";

                    case GROUP_STATUS_STREAMING:

                        return "GROUP_STATUS_STREAMING";

                    case GROUP_STATUS_SUSPENDED:

                        return "GROUP_STATUS_SUSPENDED";

                    case GROUP_STATUS_RECONFIGURED:

                        return "GROUP_STATUS_RECONFIGURED";

                    case GROUP_STATUS_DESTROYED:

                        return "GROUP_STATUS_DESTROYED";

                    default:

                        break;

                }