Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e386007 authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix renaming in device filter" into tm-dev am: a0ca2766 am:... 

Merge "Fix renaming in device filter" into tm-dev am: a0ca2766 am: 59346048 am: db74ef79 am: f460fca9

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



Change-Id: Ie099e9c9c018652fe98cd8daa9d056b57b10100e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6d889f2 f460fca9

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceFilterPair.java

+1 −1
Original line number Diff line number Diff line
@@ -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);