PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Nishi
2018-03-29 17:33:27 +00:00
committed by Android (Google) Code Review
parent bfc661ea3e 103b4d4619
commit 6ff8bbeb4a
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
View File

@@ -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);
}

8
tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
View File

@@ -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);
}
}