Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tom Hsu
2023-06-30 06:27:42 +00:00
committed by Automerger Merge Worker
parent 97e1ac7877 86592dd4c8
commit cc6dab3175
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -583,7 +583,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
*/ */
public void setName(String name) { public void setName(String name) {
// Prevent getName() to be set to null if setName(null) is called // 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; return;
} }
mDevice.setAlias(name); mDevice.setAlias(name);

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

@@ -1014,6 +1014,13 @@ public class CachedBluetoothDeviceTest {
verify(mDevice, never()).setAlias(any()); verify(mDevice, never()).setAlias(any());
} }
@Test
public void setName_setDeviceNameIsEmpty() {
mCachedDevice.setName("");
verify(mDevice, never()).setAlias(any());
}
@Test @Test
public void getProfileConnectionState_nullProfile_returnDisconnected() { public void getProfileConnectionState_nullProfile_returnDisconnected() {
assertThat(mCachedDevice.getProfileConnectionState(null)).isEqualTo( assertThat(mCachedDevice.getProfileConnectionState(null)).isEqualTo(