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: 0075b600f7

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

Change-Id: Ib6244cad597ceee7b051aea211c07900e8ad3b30
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:05:45 +00:00
committed by Automerger Merge Worker
parent e879b116ed 0075b600f7
commit dbef0300fe
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);