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 am: a0ca2766e7 am: 59346048f3 am: db74ef7909

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

Change-Id: I8430d26ea101f6f6a11e5a45db344d99d1ccdefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Chen
2022-05-12 18:02:15 +00:00
committed by Automerger Merge Worker
parent c117d43825 db74ef7909
commit f460fca98d
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() {
if (mFilter != null) mFilter.getDeviceDisplayName(mDevice);
if (mFilter != null) return mFilter.getDeviceDisplayName(mDevice);
if (mDevice instanceof BluetoothDevice) {
return getDeviceDisplayNameInternal((BluetoothDevice) mDevice);