Merge "Remove uninitialized tz path from MccTable" (3048314d) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -200,9 +200,6 @@ public final class MccTable {
		}

		Slog.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc);
		if (mcc != 0) {
		setTimezoneFromMccIfNeeded(context, mcc);
		}

		try {
		Configuration config = new Configuration();
		@@ -351,22 +348,6 @@ public final class MccTable {
		return null;
		}

		/**
		* If the timezone is not already set, set it based on the MCC of the SIM.
		* @param context Context to act on.
		* @param mcc Mobile Country Code of the SIM or SIM-like entity (build prop on CDMA)
		*/
		private static void setTimezoneFromMccIfNeeded(Context context, int mcc) {
		if (!TimeServiceHelperImpl.isTimeZoneSettingInitializedStatic()) {
		String zoneId = defaultTimeZoneForMcc(mcc);
		if (zoneId != null && zoneId.length() > 0) {
		// Set time zone based on MCC
		TimeServiceHelperImpl.setDeviceTimeZoneStatic(context, zoneId);
		Slog.d(LOG_TAG, "timezone set to " + zoneId);
		}
		}
		}

		/**
		* Get Locale based on the MCC of the SIM.
		*