Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow. (1d7c1f11) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -472,7 +472,7 @@ public abstract class ServiceStateTracker extends Handler {
		* @param needToFixTimeZone
		* @return true if time zone needs to be fixed
		*/
		protected boolean isTimeZoneFixNeeded(PhoneBase phoneBase, String operatorNumeric,
		protected boolean shouldFixTimeZoneNow(PhoneBase phoneBase, String operatorNumeric,
		String prevOperatorNumeric, boolean needToFixTimeZone) {
		// Return false if the mcc isn't valid as we don't know where we are.
		// Return true if we have an IccCard and the mcc changed or we
		@@ -485,7 +485,7 @@ public abstract class ServiceStateTracker extends Handler {
		mcc = Integer.parseInt(operatorNumeric.substring(0, 3));
		} catch (Exception e) {
		if (DBG) {
		log("isTimeZoneFixNeeded: no mcc, operatorNumeric=" + operatorNumeric +
		log("shouldFixTimeZoneNow: no mcc, operatorNumeric=" + operatorNumeric +
		" retVal=false");
		}
		return false;
		@@ -507,7 +507,7 @@ public abstract class ServiceStateTracker extends Handler {
		// Determine retVal
		boolean retVal = ((iccCardExist && (mcc != prevMcc)) \|\| needToFixTimeZone);
		if (DBG) {
		log("isTimeZoneFixNeeded: retVal=" + retVal +
		log("shouldFixTimeZoneNow: retVal=" + retVal +
		" iccCard=" + iccCard +
		" iccCard.state=" + (iccCard == null ? "null" : iccCard.getState().toString()) +
		" iccCardExist=" + iccCardExist +

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,7 +396,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		isoCountryCode);
		mGotCountryCode = true;

		if (isTimeZoneFixNeeded(phone, operatorNumeric, prevOperatorNumeric,
		if (shouldFixTimeZoneNow(phone, operatorNumeric, prevOperatorNumeric,
		mNeedFixZone)) {
		fixTimeZone(isoCountryCode);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1024,7 +1024,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		isoCountryCode);
		mGotCountryCode = true;

		if (isTimeZoneFixNeeded(phone, operatorNumeric, prevOperatorNumeric,
		if (shouldFixTimeZoneNow(phone, operatorNumeric, prevOperatorNumeric,
		mNeedFixZone)) {
		fixTimeZone(isoCountryCode);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -905,7 +905,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
		}
		}

		if (isTimeZoneFixNeeded(phone, operatorNumeric, prevOperatorNumeric,
		if (shouldFixTimeZoneNow(phone, operatorNumeric, prevOperatorNumeric,
		mNeedFixZone)) {
		// If the offset is (0, false) and the timezone property
		// is set, use the timezone property rather than