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

Commit 51e760e0 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "bt: Set alias for all devices in a set" am: 2c2aced0 am: 8937e79c... 

Merge "bt: Set alias for all devices in a set" am: 2c2aced0 am: 8937e79c am: 08f866f9 am: 973e39c0

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



Change-Id: I459cffe2be556ed51a0f6a32da8e3dc9b9e514de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d09e3113 973e39c0

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+8 −3
Original line number Diff line number Diff line
@@ -581,9 +581,14 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
     */

    public void setName(String name) {

        // Prevent getName() to be set to null if setName(null) is called

        if (name != null && !TextUtils.equals(name, getName())) {

        if (name == null || TextUtils.equals(name, getName())) {

            return;

        }

        mDevice.setAlias(name);

        dispatchAttributesChanged();



        for (CachedBluetoothDevice cbd : mMemberDevices) {

            cbd.setName(name);

        }

    }