From 1d7c1f11179fae48271b8bcd8bf06760f9cb04ec Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Thu, 3 May 2012 10:34:17 -0700
Subject: Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow.

Change-Id: I01c73a0afaa17793f9dea1b78c9fe49fa138f787
---
 .../java/com/android/internal/telephony/ServiceStateTracker.java    | 6 +++---
 .../android/internal/telephony/cdma/CdmaLteServiceStateTracker.java | 2 +-
 .../android/internal/telephony/cdma/CdmaServiceStateTracker.java    | 2 +-
 .../com/android/internal/telephony/gsm/GsmServiceStateTracker.java  | 2 +-
 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 190d9094c17f..bd780654e916 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 5a0df9974a92..297c2ac90974 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 dd188e9705f8..ba2e51a2353e 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 bded25af859f..42355774dae9 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
-- 
cgit v1.2.3-59-g8ed1b