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

Merge "Fix renaming in device filter" into tm-dev

Browse Source
This commit is contained in:
Evan Chen
2022-05-12 17:12:34 +00:00
committed by Android (Google) Code Review
parent fb9cbc6a26 c93b650036
commit a0ca2766e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java
View File

@@ -47,7 +47,7 @@ class DeviceFilterPair<T extends Parcelable> {
} }
String getDisplayName() { String getDisplayName() {
if (mFilter != null) mFilter.getDeviceDisplayName(mDevice); if (mFilter != null) return mFilter.getDeviceDisplayName(mDevice);
if (mDevice instanceof BluetoothDevice) { if (mDevice instanceof BluetoothDevice) {
return getDeviceDisplayNameInternal((BluetoothDevice) mDevice); return getDeviceDisplayNameInternal((BluetoothDevice) mDevice);