Merge "Set default value for mobile listPreference"

2018-12-23 02:18:20 +00:00
parent ecc5bf11f1 6d70582054
commit 92da0c0005
2 changed files with 13 additions and 1 deletions
--- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -124,6 +124,18 @@ public class EnabledNetworkModePreferenceControllerTest {
        assertThat(mPreference.getSummary()).isEqualTo("3G");
    }

+    @Test
+    public void updateState_updateByNetworkMode_useDefaultValue() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+                TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
+    }
+
    @Test
    public void onPreferenceChange_updateSuccess() {
        doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,