diff options
| author | 2022-05-12 18:05:45 +0000 | |
|---|---|---|
| committer | 2022-05-12 18:05:45 +0000 | |
| commit | dbef0300fe65f955c8a94dc16fd4b7f7cbdfe5ae (patch) | |
| tree | 754dd67f01cf031b42697e3ce3378cdec94dbc2f | |
| parent | e879b116ed47bd257ec620e7cd55411b6622f8e2 (diff) | |
| parent | 0075b600f73c82abe29fcf16f1672f3db1d4d625 (diff) | |
Merge "Fix renaming in device filter" into tm-dev am: a0ca2766e7 am: 0075b600f7
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>
| -rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java index faca1ae3f058..1f59d30207d8 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java @@ -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); |