diff options
| author | Wink Saville <wink@google.com> | 2012-05-03 12:19:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-03 12:19:45 -0700 |
| commit | e06747c727c9edc05c1d32f389a2347a11f653d5 (patch) | |
| tree | 8bdf93e53a3467764309d2537f5963b4393f830d | |
| parent | 2c6200dac2cae3a378e7d0f309e1770f9f158b48 (diff) | |
| parent | 1d7c1f11179fae48271b8bcd8bf06760f9cb04ec (diff) | |
| download | frameworks_base-e06747c727c9edc05c1d32f389a2347a11f653d5.zip frameworks_base-e06747c727c9edc05c1d32f389a2347a11f653d5.tar.gz frameworks_base-e06747c727c9edc05c1d32f389a2347a11f653d5.tar.bz2 | |
Merge "Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow." into jb-dev
4 files changed, 6 insertions, 6 deletions
diff --git a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java index 190d909..bd78065 100644 --- a/telephony/java/com/android/internal/telephony/ServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/ServiceStateTracker.java @@ -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 + diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index 5a0df99..297c2ac 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java @@ -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); } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index dd188e9..ba2e51a 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -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); } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index bded25a..4235577 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -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 |