Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow.

Browse Source 
Change-Id: I01c73a0afaa17793f9dea1b78c9fe49fa138f787
This commit is contained in:
Wink Saville
2012-05-03 10:34:17 -07:00
parent c793d62613
commit 1d7c1f1117
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/ServiceStateTracker.java
View File

@@ -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 +

2
telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
View File

@@ -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);
}

2
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -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);
}

2
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -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