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

Commit 6cae175c authored by Grzegorz Kolodziejczyk's avatar Grzegorz Kolodziejczyk Committed by Automerger Merge Worker
Browse files

Merge "Add context for LE Audio group descriptor logging" am: 760a857a am: 43a82c1e 

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



Change-Id: I8be9c68870e9f41122fa38d7ef0896e8e8caaba9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5f3ab9c 43a82c1e

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

+9 −5
Original line number Diff line number Diff line
@@ -1436,7 +1436,8 @@ public class LeAudioService extends ProfileService { 
        synchronized (mGroupLock) {

            LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);

            if (descriptor == null || descriptor.mIsActive) {

                Log.e(TAG, "no descriptors for group: " + groupId + " or group already active");

                Log.e(TAG, "handleGroupTransitToActive: no descriptors for group: " + groupId

                        + " or group already active");

                return;

            }
@@ -1454,7 +1455,8 @@ public class LeAudioService extends ProfileService { 
        synchronized (mGroupLock) {

            LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);

            if (descriptor == null || !descriptor.mIsActive) {

                Log.e(TAG, "no descriptors for group: " + groupId + " or group already inactive");

                Log.e(TAG, "handleGroupTransitToInactive: no descriptors for group: " + groupId

                        + " or group already inactive");

                return;

            }
@@ -1720,7 +1722,7 @@ public class LeAudioService extends ProfileService { 
                    descriptor.mAvailableContexts = available_contexts;

                    updateInbandRingtoneForTheGroup(groupId);

                } else {

                    Log.e(TAG, "no descriptors for group: " + groupId);

                    Log.e(TAG, "messageFromNative: no descriptors for group: " + groupId);

                }

            }

        } else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_SINK_AUDIO_LOCATION_AVAILABLE) {
@@ -2016,7 +2018,8 @@ public class LeAudioService extends ProfileService { 
            if (descriptor != null) {

                descriptor.mIsConnected = true;

            } else {

                Log.e(TAG, "no descriptors for group: " + deviceDescriptor.mGroupId);

                Log.e(TAG, "connectionStateChanged(STATE_CONNECTED): no descriptors for group: "

                        + deviceDescriptor.mGroupId);

            }

        }

        // Check if the device is disconnected - if unbond, remove the state machine
@@ -2032,7 +2035,8 @@ public class LeAudioService extends ProfileService { 
            synchronized (mGroupLock) {

                LeAudioGroupDescriptor descriptor = getGroupDescriptor(deviceDescriptor.mGroupId);

                if (descriptor == null) {

                    Log.e(TAG, "no descriptors for group: " + deviceDescriptor.mGroupId);

                    Log.e(TAG, "connectionStateChanged(STATE_DISCONNECTED): no descriptors for "

                            + "group: " + deviceDescriptor.mGroupId);

                    return;

                }