commit f6c37363528ab5035c1cb36e687454f903a5591f
author Angela Wang <angelala@google.com> Thu Aug 10 00:50:16 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 10 00:50:16 2023 +0000
tree 144d91666cc360f56ce76acb4046fc4c7f5211b4
parent b7f9d72560c5845b951ff2d43ec14163271361c1
parent e4d7d5e3521667a60adc332923d07972d8f534f8

Merge "Show binaural ASHA hearing aids addresses" into main

src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
index d80512e..9943013 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -59,6 +59,12 @@
                 title.append("\n").append(member.getIdentityAddress());
             }
             mFooterPreference.setTitle(title);
+        } else if (mCachedDevice.getSubDevice() != null) {
+            StringBuilder title = new StringBuilder(mContext.getString(
+                    R.string.bluetooth_multuple_devices_mac_address,
+                    mCachedDevice.getIdentityAddress()));
+            title.append("\n").append(mCachedDevice.getSubDevice().getIdentityAddress());
+            mFooterPreference.setTitle(title);
         } else {
             mFooterPreference.setTitle(mContext.getString(
                     R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress()));