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

Commit 49058e92 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Don't allow a zero-length device name to work." into pi-dev 

am: 6ff8bbeb

Change-Id: Ic9e67a1a03b5ae2ac79326770c779e969849146e
parents 978d2dd5 6ff8bbeb

src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ public class DeviceNamePreferenceController extends BasePreferenceController 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = (ValidatedEditTextPreference) screen.findPreference(PREF_KEY);

        mPreference.setSummary(getSummary());

        final CharSequence deviceName = getSummary();

        mPreference.setSummary(deviceName);

        mPreference.setText(deviceName.toString());

        mPreference.setValidator(this);

    }

tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java

+8 −0
Original line number Diff line number Diff line
@@ -123,4 +123,12 @@ public class DeviceNamePreferenceControllerTest { 
        verify(mWifiManager).setWifiApConfiguration(captor.capture());

        assertThat(captor.getValue().SSID).isEqualTo(TESTING_STRING);

    }



    @Test

    public void displayPreference_defaultDeviceNameIsModelNameOnPreference() {

        mController.displayPreference(mScreen);



        assertThat(mPreference.getText()).isEqualTo(Build.MODEL);

    }



}