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

Commit d0e9a7b2 authored by Eric Caruso's avatar Eric Caruso Committed by android-build-merger
Browse files

Merge "RemoteDevices: Use String(val) to set a remote device alias" am: 3d70e0cb 

am: 76436ff4

Change-Id: I6ffd73aa5ab9dfaf4ebaecbf4ac1fc1d001cf9de
parents a5cdb142 76436ff4

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+2 −5
Original line number Diff line number Diff line
@@ -514,11 +514,8 @@ final class RemoteDevices { 
                            debugLog("Remote Device name is: " + device.mName);

                            break;

                        case AbstractionLayer.BT_PROPERTY_REMOTE_FRIENDLY_NAME:

                            if (device.mAlias != null) {

                                System.arraycopy(val, 0, device.mAlias, 0, val.length);

                            } else {

                            device.mAlias = new String(val);

                            }

                            debugLog("Remote device alias is: " + device.mAlias);

                            break;

                        case AbstractionLayer.BT_PROPERTY_BDADDR:

                            device.mAddress = val;