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

Commit 86592dd4 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "[Bluetooth] Avoid crash from emtpy devcie name." into udc-d1-dev

parents 3a1da8a4 a1e24360

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

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ 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 (TextUtils.isEmpty(name) || TextUtils.equals(name, getName())) {

            return;

        }

        mDevice.setAlias(name);

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+7 −0
Original line number Diff line number Diff line
@@ -1014,6 +1014,13 @@ public class CachedBluetoothDeviceTest { 
        verify(mDevice, never()).setAlias(any());

    }



    @Test

    public void setName_setDeviceNameIsEmpty() {

        mCachedDevice.setName("");



        verify(mDevice, never()).setAlias(any());

    }



    @Test

    public void getProfileConnectionState_nullProfile_returnDisconnected() {

        assertThat(mCachedDevice.getProfileConnectionState(null)).isEqualTo(