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

Commit 0d964f76 authored Nov 29, 2021 by Alice Kuo

Minor clean-up for LE audio setting

Bug: 178981521
Test: build pass
Change-Id: Ica8bd68bea494ee72fa53fbb8f9101dc535470b6

parent 8f91ac3e

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