diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java
index 10cac42..656d9f5 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java
@@ -42,6 +42,7 @@
 
 public class AudioSharingUtils {
     private static final String TAG = "AudioSharingUtils";
+    private static final boolean DEBUG = BluetoothUtils.D;
 
     /**
      * Fetch {@link CachedBluetoothDevice}s connected to the broadcast assistant. The devices are
@@ -77,6 +78,9 @@
             }
             groupedDevices.get(groupId).add(cachedDevice);
         }
+        if (DEBUG) {
+            Log.d(TAG, "fetchConnectedDevicesByGroupId: " + groupedDevices);
+        }
         return groupedDevices;
     }
 
@@ -221,16 +225,7 @@
      * @return Whether the device is an active le audio device.
      */
     public static boolean isActiveLeAudioDevice(CachedBluetoothDevice cachedDevice) {
-        if (BluetoothUtils.isActiveLeAudioDevice(cachedDevice)) {
-            return true;
-        }
-        // Return true if member device is an active le audio device.
-        for (CachedBluetoothDevice device : cachedDevice.getMemberDevice()) {
-            if (BluetoothUtils.isActiveLeAudioDevice(device)) {
-                return true;
-            }
-        }
-        return false;
+        return BluetoothUtils.isActiveLeAudioDevice(cachedDevice);
     }
 
     /**
@@ -296,7 +291,10 @@
             }
         }
         if (targetDevice != null && !isActiveLeAudioDevice(targetDevice)) {
-            Log.d(TAG, "Set active device: " + targetDevice.getDevice().getAnonymizedAddress());
+            Log.d(
+                    TAG,
+                    "updateActiveDeviceIfNeeded, set active device: "
+                            + targetDevice.getDevice().getAnonymizedAddress());
             targetDevice.setActive();
         }
     }