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

Commit 689086b2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Minor clean-up for LE audio setting" am: e41d1b97 am: ad041d78 am:... 

Merge "Minor clean-up for LE audio setting" am: e41d1b97 am: ad041d78 am: 7e7b1f72 am: 96d33dbd

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

Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
parents a38e83e8 96d33dbd

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

+3 −3
Original line number Diff line number Diff line
@@ -52,12 +52,12 @@ public class BluetoothDetailsMacAddressController extends BluetoothDetailsContro 
    @Override

    protected void refresh() {

        if (mCachedDevice.getGroupId() != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) {

            StringBuilder mTitle = new StringBuilder(mContext.getString(

            StringBuilder title = new StringBuilder(mContext.getString(

                R.string.bluetooth_multuple_devices_mac_address, mCachedDevice.getAddress()));

            for (CachedBluetoothDevice member: mCachedDevice.getMemberDevice()) {

                mTitle.append("\n").append(member.getAddress());

                title.append("\n").append(member.getAddress());

            }

            mFooterPreference.setTitle(mTitle);

            mFooterPreference.setTitle(title);

        } else {

            mFooterPreference.setTitle(mContext.getString(

                R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class BluetoothPairingController implements OnCheckedChangeListener, 
        mPasskeyFormatted = formatKey(mPasskey);

        final CachedBluetoothDevice cachedDevice =

                mBluetoothManager.getCachedDeviceManager().findDevice(mDevice);

        mIsCoordinatedSetMember = (cachedDevice != null)

        mIsCoordinatedSetMember = cachedDevice != null

                ? cachedDevice.isCoordinatedSetMemberDevice() : false;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addPreference() {

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addsPreference() {

        mAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
@@ -248,7 +248,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addPreference() {

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addsPreference() {

        mAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

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

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removePreference() {

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removesPreference() {

        mAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
@@ -248,7 +248,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removePreference()

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removesPreference()

    {

        mAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater