diff options
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioDeviceInventory.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/BtHelper.java | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index f38b38154bc3..9bdc51efb76f 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -987,9 +987,9 @@ public class AudioDeviceInventory { } if (di.mPeerDeviceAddress.equals("")) { for (Pair<String, String> addr : addresses) { - if (!addr.first.equals(di.mDeviceAddress)) { - di.mPeerDeviceAddress = addr.first; - di.mPeerIdentityDeviceAddress = addr.second; + if (!di.mDeviceAddress.equals(addr.first)) { + di.mPeerDeviceAddress = TextUtils.emptyIfNull(addr.first); + di.mPeerIdentityDeviceAddress = TextUtils.emptyIfNull(addr.second); break; } } @@ -1000,8 +1000,8 @@ public class AudioDeviceInventory { } if (di.mDeviceIdentityAddress.equals("")) { for (Pair<String, String> addr : addresses) { - if (addr.first.equals(di.mDeviceAddress)) { - di.mDeviceIdentityAddress = addr.second; + if (di.mDeviceAddress.equals(addr.first)) { + di.mDeviceIdentityAddress = TextUtils.emptyIfNull(addr.second); break; } } diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index edeabdc5243c..a649d34884a7 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -1110,6 +1110,12 @@ public class BtHelper { return mLeAudio.getGroupId(device); } + /** + * Returns all addresses and identity addresses for LE Audio devices a group. + * @param groupId The ID of the group from which to get addresses. + * @return A List of Pair(String main_address, String identity_address). Note that the + * addresses returned by BluetoothDevice can be null. + */ /*package*/ List<Pair<String, String>> getLeAudioGroupAddresses(int groupId) { List<Pair<String, String>> addresses = new ArrayList<>(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); |