Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ac72d1f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show identity address in the bluetooth details page" am: 5d17cfd9 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I07ff71fbb60abae09d8a3116542260b709a6a81e
parents 58fb784e 5d17cfd9

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

+5 −4
Original line number Diff line number Diff line
@@ -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()));

        }

    }

tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java

+1 −0
Original line number Diff line number Diff line
@@ -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());

    }



    /**

tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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);