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

Merge "bt: Set alias for all devices in a set" into udc-dev am: 019dfd6cda

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

Change-Id: I100ddb93924aca2c9ac2d9ba577b5a2de5081f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Narajowski
2023-05-04 11:15:47 +00:00
committed by Automerger Merge Worker
parent 005d22f4f3 019dfd6cda
commit c5e3d76156
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,9 +581,14 @@ 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 (name == null || TextUtils.equals(name, getName())) {
return;
}
mDevice.setAlias(name); mDevice.setAlias(name);
dispatchAttributesChanged(); dispatchAttributesChanged();
for (CachedBluetoothDevice cbd : mMemberDevices) {
cbd.setName(name);
} }
} }