Merge "Set default value for mobile listPreference" (92da0c00) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,6 @@ public class EnabledNetworkModePreferenceController extends BasePreferenceContro

		private void updatePreferenceEntries(ListPreference preference) {
		final int phoneType = mTelephonyManager.getPhoneType();
		final Resources resources = mContext.getResources();
		final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
		if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
		final int lteForced = android.provider.Settings.Global.getInt(
		@@ -216,6 +215,7 @@ public class EnabledNetworkModePreferenceController extends BasePreferenceContro
		}

		private void updatePreferenceValueAndSummary(ListPreference preference, int networkMode) {
		preference.setValue(Integer.toString(networkMode));
		switch (networkMode) {
		case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA:
		case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA:

+12 −0

Original line number	Diff line number	Diff line
		@@ -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,