commit a6a88a4e11211f4435728c5dde6b26fb9ca531d3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 05 12:26:54 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 05 12:26:54 2024 +0000
tree 81cbe74cebdbc21800ee500a5b6a4361e4e927c1
parent 7a26223518d64fb9c82c44687f2a266cf124548c
parent 1864dfa988b14ae225090d3997804c8d373f6c64

Merge "Use BluetoothUtils#getGroupId." into main

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
index 216574a..429e4c9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java
@@ -631,15 +631,15 @@
                 assistantProfile.getAllConnectedDevices().stream()
                         .map(deviceManager::findDevice)
                         .filter(Objects::nonNull)
-                        .map(CachedBluetoothDevice::getGroupId)
+                        .map(BluetoothUtils::getGroupId)
                         .collect(Collectors.toSet());
         Set<Integer> activeGroupIds =
                 leAudioProfile.getActiveDevices().stream()
                         .map(deviceManager::findDevice)
                         .filter(Objects::nonNull)
-                        .map(CachedBluetoothDevice::getGroupId)
+                        .map(BluetoothUtils::getGroupId)
                         .collect(Collectors.toSet());
-        int groupId = cachedDevice.getGroupId();
+        int groupId = getGroupId(cachedDevice);
         return activeGroupIds.size() == 1
                 && !activeGroupIds.contains(groupId)
                 && connectedGroupIds.size() == 2