Merge "Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow." into jb-dev

Author: Wink Saville

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

@@ -472,7 +472,7 @@ protected void cancelPollState() {
      * @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 @@ protected boolean isTimeZoneFixNeeded(PhoneBase phoneBase, String operatorNumeri
             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 @@ protected boolean isTimeZoneFixNeeded(PhoneBase phoneBase, String operatorNumeri
         // 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 +

telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

@@ -396,7 +396,7 @@ protected void pollStateDone() {
                         isoCountryCode);
                 mGotCountryCode = true;
 
-                if (isTimeZoneFixNeeded(phone, operatorNumeric, prevOperatorNumeric,
+                if (shouldFixTimeZoneNow(phone, operatorNumeric, prevOperatorNumeric,
                         mNeedFixZone)) {
                     fixTimeZone(isoCountryCode);
                 }

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

@@ -1024,7 +1024,7 @@ protected void pollStateDone() {
                         isoCountryCode);
                 mGotCountryCode = true;
 
-                if (isTimeZoneFixNeeded(phone, operatorNumeric, prevOperatorNumeric,
+                if (shouldFixTimeZoneNow(phone, operatorNumeric, prevOperatorNumeric,
                         mNeedFixZone)) {
                     fixTimeZone(isoCountryCode);
                 }

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

@@ -905,7 +905,7 @@ private void pollStateDone() {
                     }
                 }
 
-                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