From 84a9b23ba8207d809668fcffd3f6aa6a26509957 Mon Sep 17 00:00:00 2001 From: Chienyuan Date: Tue, 18 Jan 2022 16:46:46 +0800 Subject: [PATCH] Show identity address in the bluetooth details page Bug: 197044261 Test: build pass Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b --- .../bluetooth/BluetoothDetailsMacAddressController.java | 9 +++++---- .../AdvancedBluetoothDetailsHeaderControllerTest.java | 1 + .../bluetooth/BluetoothDetailsControllerTestBase.java | 1 + .../bluetooth/BluetoothDeviceDetailsFragmentTest.java | 1 + .../settings/bluetooth/BluetoothPairingDetailTest.java | 1 + .../bluetooth/ForgetDeviceDialogFragmentTest.java | 1 + .../bluetooth/RemoteDeviceNameDialogFragmentTest.java | 1 + 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index ec3e11fdaa2..d80512ed301 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -46,21 +46,22 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro protected void init(PreferenceScreen screen) { mFooterPreference = screen.findPreference(KEY_DEVICE_DETAILS_FOOTER); mFooterPreference.setTitle(mContext.getString( - R.string.bluetooth_device_mac_address, mCachedDevice.getAddress())); + R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress())); } @Override protected void refresh() { if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) { StringBuilder title = new StringBuilder(mContext.getString( - R.string.bluetooth_multuple_devices_mac_address, mCachedDevice.getAddress())); + R.string.bluetooth_multuple_devices_mac_address, + mCachedDevice.getIdentityAddress())); for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) { - title.append("\n").append(member.getAddress()); + title.append("\n").append(member.getIdentityAddress()); } mFooterPreference.setTitle(title); } else { mFooterPreference.setTitle(mContext.getString( - R.string.bluetooth_device_mac_address, mCachedDevice.getAddress())); + R.string.bluetooth_device_mac_address, mCachedDevice.getIdentityAddress())); } } diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java index 31687c6acfb..6087ef2c2ac 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java @@ -99,6 +99,7 @@ public class AdvancedBluetoothDetailsHeaderControllerTest { mController.mBluetoothAdapter = mBluetoothAdapter; when(mCachedDevice.getDevice()).thenReturn(mBluetoothDevice); when(mCachedDevice.getAddress()).thenReturn(MAC_ADDRESS); + when(mCachedDevice.getIdentityAddress()).thenReturn(MAC_ADDRESS); } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 640138816e2..6ecbf2edc9f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -155,6 +155,7 @@ public abstract class BluetoothDetailsControllerTestBase { mDevice = mBluetoothAdapter.getRemoteDevice(config.getAddress()); when(mCachedDevice.getDevice()).thenReturn(mDevice); when(mCachedDevice.getAddress()).thenReturn(config.getAddress()); + when(mCachedDevice.getIdentityAddress()).thenReturn(config.getAddress()); } /** diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index ce41a8d7ca8..fac8b584f0a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -89,6 +89,7 @@ public class BluetoothDeviceDetailsFragmentTest { when(fragmentManager.beginTransaction()).thenReturn(mFragmentTransaction); when(mCachedDevice.getAddress()).thenReturn(TEST_ADDRESS); + when(mCachedDevice.getIdentityAddress()).thenReturn(TEST_ADDRESS); Bundle args = new Bundle(); args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, TEST_ADDRESS); mFragment.setArguments(args); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index ea841fa35d3..bac868f4585 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -305,6 +305,7 @@ public class BluetoothPairingDetailTest { when(cachedDevice.isConnected()).thenReturn(true); when(cachedDevice.getDevice()).thenReturn(device2); when(cachedDevice.getAddress()).thenReturn(TEST_DEVICE_ADDRESS_B); + when(cachedDevice.getIdentityAddress()).thenReturn(TEST_DEVICE_ADDRESS_B); mFragment.onProfileConnectionStateChanged(cachedDevice, BluetoothProfile.A2DP, BluetoothAdapter.STATE_CONNECTED); diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index b4f4f97f228..245a297b555 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -73,6 +73,7 @@ public class ForgetDeviceDialogFragmentTest { FakeFeatureFactory.setupForTest(); String deviceAddress = "55:66:77:88:99:AA"; when(mCachedDevice.getAddress()).thenReturn(deviceAddress); + when(mCachedDevice.getIdentityAddress()).thenReturn(deviceAddress); when(mCachedDevice.getDevice()).thenReturn(mBluetoothDevice); when(mCachedDevice.getName()).thenReturn(DEVICE_NAME); mFragment = spy(ForgetDeviceDialogFragment.newInstance(deviceAddress)); diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index c8467b2a57e..ad5b70c70ec 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -62,6 +62,7 @@ public class RemoteDeviceNameDialogFragmentTest { String deviceAddress = "55:66:77:88:99:AA"; when(mCachedDevice.getAddress()).thenReturn(deviceAddress); + when(mCachedDevice.getIdentityAddress()).thenReturn(deviceAddress); mFragment = spy(RemoteDeviceNameDialogFragment.newInstance(mCachedDevice)); doReturn(mCachedDevice).when(mFragment).getDevice(any()); }