Merge "Fixed incorrect time zone when the device is on IWLAN" into oc-dr1-dev (cd7d8320) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ServiceStateTracker.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -2811,7 +2811,13 @@ public class ServiceStateTracker extends Handler {
		tm.setNetworkCountryIsoForPhone(mPhone.getPhoneId(), "");
		mGotCountryCode = false;
		mNitzUpdatedTime = false;
		} else {
		} else if (mSS.getRilDataRadioTechnology() != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN) {
		// Update time zone, ISO, and IDD.
		//
		// If the device is on IWLAN, modems manufacture a ServiceState with the MCC/MNC of
		// the SIM as if we were talking to towers. Telephony code then uses that with
		// mccTable to suggest a timezone. We shouldn't do that if the MCC/MNC is from IWLAN

		String iso = "";
		String mcc = "";
		try {