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

Commit cc6dab31 authored Jun 30, 2023 by Tom Hsu Committed by Automerger Merge Worker Jun 30, 2023

Merge "[Bluetooth] Avoid crash from emtpy devcie name." into udc-d1-dev am: 86592dd4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23844629

Change-Id: I95d1d6a1331f440868d95c44240f374128cab618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 97e1ac78 86592dd4

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -583,7 +583,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		*/
		public void setName(String name) {
		// Prevent getName() to be set to null if setName(null) is called
		if (name == null \|\| TextUtils.equals(name, getName())) {
		if (TextUtils.isEmpty(name) \|\| TextUtils.equals(name, getName())) {
		return;
		}
		mDevice.setAlias(name);

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1014,6 +1014,13 @@ public class CachedBluetoothDeviceTest {
		verify(mDevice, never()).setAlias(any());
		}

		@Test
		public void setName_setDeviceNameIsEmpty() {
		mCachedDevice.setName("");

		verify(mDevice, never()).setAlias(any());
		}

		@Test
		public void getProfileConnectionState_nullProfile_returnDisconnected() {
		assertThat(mCachedDevice.getProfileConnectionState(null)).isEqualTo(