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

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

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