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

Cleanup debugging.

Browse Source 
Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
This commit is contained in:
Wink Saville
2011-04-08 11:14:23 -07:00
parent 1905e166ed
commit 5203a5bc28
8 changed files with 169 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,6 +292,7 @@ public abstract class ServiceStateTracker extends Handler {
protected abstract void updateSpnDisplay(); protected abstract void updateSpnDisplay();
protected abstract void setPowerStateToDesired(); protected abstract void setPowerStateToDesired();
protected abstract void log(String s); protected abstract void log(String s);
protected abstract void loge(String s);
public abstract int getCurrentDataConnectionState(); public abstract int getCurrentDataConnectionState();
public abstract boolean isConcurrentVoiceAndDataAllowed(); public abstract boolean isConcurrentVoiceAndDataAllowed();

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

@@ -49,7 +49,7 @@ public class CdmaDataConnection extends DataConnection {
synchronized (mCountLock) { synchronized (mCountLock) {
mCount += 1; mCount += 1;
} }
CdmaDataConnection cdmaDc = new CdmaDataConnection(phone, "CdmaDataConnection-" + mCount, CdmaDataConnection cdmaDc = new CdmaDataConnection(phone, "CdmaDC-" + mCount,
id, rm); id, rm);
cdmaDc.start(); cdmaDc.start();
if (DBG) cdmaDc.log("Made " + cdmaDc.getName()); if (DBG) cdmaDc.log("Made " + cdmaDc.getName());

4
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
View File

@@ -913,11 +913,11 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected void log(String s) { protected void log(String s) {
Log.d(LOG_TAG, "[CdmaDataConnectionTracker] " + s); Log.d(LOG_TAG, "[CdmaDCT] " + s);
} }
@Override @Override
protected void loge(String s) { protected void loge(String s) {
Log.e(LOG_TAG, "[CdmaDataConnectionTracker] " + s); Log.e(LOG_TAG, "[CdmaDCT] " + s);
} }
} }

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

@@ -51,7 +51,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
public CdmaLteServiceStateTracker(CDMALTEPhone phone) { public CdmaLteServiceStateTracker(CDMALTEPhone phone) {
super(phone); super(phone);
mCdmaLtePhone = phone; mCdmaLtePhone = phone;
log("CdmaLteServiceStateTracker Constructors"); if (DBG) log("CdmaLteServiceStateTracker Constructors");
} }
/** /**
@@ -68,7 +68,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
int[] ints; int[] ints;
String[] strings; String[] strings;
if (msg.what == EVENT_POLL_STATE_GPRS) { if (msg.what == EVENT_POLL_STATE_GPRS) {
log("handleMessage EVENT_POLL_STATE_GPRS"); if (DBG) log("handleMessage EVENT_POLL_STATE_GPRS");
ar = (AsyncResult)msg.obj; ar = (AsyncResult)msg.obj;
handlePollStateResult(msg.what, ar); handlePollStateResult(msg.what, ar);
} else { } else {
@@ -90,7 +90,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
@Override @Override
protected void handlePollStateResultMessage(int what, AsyncResult ar) { protected void handlePollStateResultMessage(int what, AsyncResult ar) {
if (what == EVENT_POLL_STATE_GPRS) { if (what == EVENT_POLL_STATE_GPRS) {
log("handlePollStateResultMessage EVENT_POLL_STATE_GPRS"); if (DBG) log("handlePollStateResultMessage: EVENT_POLL_STATE_GPRS");
String states[] = (String[])ar.result; String states[] = (String[])ar.result;
int type = 0; int type = 0;
@@ -104,8 +104,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
type = Integer.parseInt(states[3]); type = Integer.parseInt(states[3]);
} }
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.w(LOG_TAG, loge("handlePollStateResultMessage: error parsing GprsRegistrationState: "
"[CdmaLteServiceStateTracker] error parsing GprsRegistrationState: "
+ ex); + ex);
} }
} }
@@ -170,8 +169,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
.getContentResolver(), .getContentResolver(),
android.provider.Settings.Secure.PREFERRED_NETWORK_MODE, android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
RILConstants.PREFERRED_NETWORK_MODE); RILConstants.PREFERRED_NETWORK_MODE);
Log.v(LOG_TAG, "[CdmaLteServiceStateTracker] The network mode here is = " if (DBG) log("pollState: network mode here is = " + networkMode);
+ networkMode);
if ((networkMode == RILConstants.NETWORK_MODE_GLOBAL) if ((networkMode == RILConstants.NETWORK_MODE_GLOBAL)
|| (networkMode == RILConstants.NETWORK_MODE_LTE_ONLY)) { || (networkMode == RILConstants.NETWORK_MODE_LTE_ONLY)) {
pollingContext[0]++; pollingContext[0]++;
@@ -210,10 +208,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
ret = "CDMA - eHRPD"; ret = "CDMA - eHRPD";
break; break;
default: default:
if (DBG) { sloge("networkTypeToString: Wrong network, can not return a string.");
Log.e(LOG_TAG, " [CdmaLteServiceStateTracker] Wrong network."
+ " Can not return a string.");
}
break; break;
} }
return ret; return ret;
@@ -221,7 +216,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
@Override @Override
protected void pollStateDone() { protected void pollStateDone() {
log("Poll ServiceState done: oldSS=[" + ss + "] newSS=[" + newSS + "]"); if (DBG) log("pollStateDone: oldSS=[" + ss + "] newSS=[" + newSS + "]");
boolean hasRegistered = ss.getState() != ServiceState.STATE_IN_SERVICE boolean hasRegistered = ss.getState() != ServiceState.STATE_IN_SERVICE
&& newSS.getState() == ServiceState.STATE_IN_SERVICE; && newSS.getState() == ServiceState.STATE_IN_SERVICE;
@@ -266,12 +261,15 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
((newNetworkType >= ServiceState.RADIO_TECHNOLOGY_IS95A) && ((newNetworkType >= ServiceState.RADIO_TECHNOLOGY_IS95A) &&
(newNetworkType <= ServiceState.RADIO_TECHNOLOGY_EVDO_A)); (newNetworkType <= ServiceState.RADIO_TECHNOLOGY_EVDO_A));
log("hasRegistered = " + hasRegistered + " hasCdmaDataConnectionAttached = " if (DBG) {
log("pollStateDone: hasRegistered = "
+ hasRegistered + " hasCdmaDataConnectionAttached = "
+ hasCdmaDataConnectionAttached + " hasCdmaDataConnectionChanged = " + hasCdmaDataConnectionAttached + " hasCdmaDataConnectionChanged = "
+ hasCdmaDataConnectionChanged + " hasNetworkTypeChanged = " + hasCdmaDataConnectionChanged + " hasNetworkTypeChanged = "
+ hasNetworkTypeChanged + " has4gHandoff = " + has4gHandoff + hasNetworkTypeChanged + " has4gHandoff = " + has4gHandoff
+ " hasMultiApnSupport = " + hasMultiApnSupport + " hasLostMultiApnSupport = " + " hasMultiApnSupport = " + hasMultiApnSupport + " hasLostMultiApnSupport = "
+ hasLostMultiApnSupport); + hasLostMultiApnSupport);
}
// Add an event log when connection state changes // Add an event log when connection state changes
if (ss.getState() != newSS.getState() if (ss.getState() != newSS.getState()
|| cdmaDataConnectionState != newCdmaDataConnectionState) { || cdmaDataConnectionState != newCdmaDataConnectionState) {
@@ -295,14 +293,14 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
if ((hasMultiApnSupport) if ((hasMultiApnSupport)
&& (phone.mDataConnection instanceof CdmaDataConnectionTracker)) { && (phone.mDataConnection instanceof CdmaDataConnectionTracker)) {
log("GsmDataConnectionTracker Created"); if (DBG) log("pollStateDone: dispose of current DCT create new GsmDCT");
phone.mDataConnection.dispose(); phone.mDataConnection.dispose();
phone.mDataConnection = new GsmDataConnectionTracker(mCdmaLtePhone); phone.mDataConnection = new GsmDataConnectionTracker(mCdmaLtePhone);
} }
if ((hasLostMultiApnSupport) if ((hasLostMultiApnSupport)
&& (phone.mDataConnection instanceof GsmDataConnectionTracker)) { && (phone.mDataConnection instanceof GsmDataConnectionTracker)) {
log("GsmDataConnectionTracker disposed"); if (DBG) log("pollStateDone: dispose of current DCT create new CdmaDCT");
phone.mDataConnection.dispose(); phone.mDataConnection.dispose();
phone.mDataConnection = new CdmaDataConnectionTracker((CDMAPhone)phone); phone.mDataConnection = new CdmaDataConnectionTracker((CDMAPhone)phone);
} }
@@ -360,9 +358,9 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
isoCountryCode = MccTable.countryCodeForMcc(Integer.parseInt(operatorNumeric isoCountryCode = MccTable.countryCodeForMcc(Integer.parseInt(operatorNumeric
.substring(0, 3))); .substring(0, 3)));
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.w(LOG_TAG, "countryCodeForMcc error" + ex); loge("countryCodeForMcc error" + ex);
} catch (StringIndexOutOfBoundsException ex) { } catch (StringIndexOutOfBoundsException ex) {
Log.w(LOG_TAG, "countryCodeForMcc error" + ex); loge("countryCodeForMcc error" + ex);
} }
phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY,
@@ -442,7 +440,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
try { try {
phone.notifySignalStrength(); phone.notifySignalStrength();
} catch (NullPointerException ex) { } catch (NullPointerException ex) {
log("onSignalStrengthResult() Phone already destroyed: " + ex loge("onSignalStrengthResult() Phone already destroyed: " + ex
+ "SignalStrength not notified"); + "SignalStrength not notified");
} }
} }
@@ -457,7 +455,15 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
@Override @Override
protected void log(String s) { protected void log(String s) {
if (DBG) Log.d(LOG_TAG, "[CdmaLteSST] " + s);
Log.d(LOG_TAG, "[CdmaLteServiceStateTracker] " + s); }
@Override
protected void loge(String s) {
Log.e(LOG_TAG, "[CdmaLteSST] " + s);
}
protected static void sloge(String s) {
Log.e(LOG_TAG, "[CdmaLteSST] " + s);
} }
} }

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

@@ -148,7 +148,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
private ContentObserver mAutoTimeObserver = new ContentObserver(new Handler()) { private ContentObserver mAutoTimeObserver = new ContentObserver(new Handler()) {
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
Log.i("CdmaServiceStateTracker", "Auto time state changed"); if (DBG) log("Auto time state changed");
revertToNitzTime(); revertToNitzTime();
} }
}; };
@@ -156,7 +156,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
private ContentObserver mAutoTimeZoneObserver = new ContentObserver(new Handler()) { private ContentObserver mAutoTimeZoneObserver = new ContentObserver(new Handler()) {
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
Log.i("CdmaServiceStateTracker", "Auto time zone state changed"); if (DBG) log("Auto time zone state changed");
revertToNitzTimeZone(); revertToNitzTimeZone();
} }
}; };
@@ -344,7 +344,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
networkId = Integer.parseInt(states[9]); networkId = Integer.parseInt(states[9]);
} }
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.w(LOG_TAG, "error parsing cell location data: " + ex); loge("error parsing cell location data: " + ex);
} }
} }
@@ -378,11 +378,11 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
try { try {
mHomeSystemId[i] = Integer.parseInt(sid[i]); mHomeSystemId[i] = Integer.parseInt(sid[i]);
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.e(LOG_TAG, "error parsing system id: ", ex); loge("error parsing system id: " + ex);
} }
} }
} }
Log.d(LOG_TAG,"GET_CDMA_SUBSCRIPTION SID=" + cdmaSubscription[1] ); if (DBG) log("GET_CDMA_SUBSCRIPTION: SID=" + cdmaSubscription[1] );
if (cdmaSubscription[2] != null) { if (cdmaSubscription[2] != null) {
String[] nid = cdmaSubscription[2].split(","); String[] nid = cdmaSubscription[2].split(",");
@@ -391,14 +391,14 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
try { try {
mHomeNetworkId[i] = Integer.parseInt(nid[i]); mHomeNetworkId[i] = Integer.parseInt(nid[i]);
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.e(LOG_TAG, "error parsing network id: ", ex); loge("GET_CDMA_SUBSCRIPTION: error parsing network id: " + ex);
} }
} }
} }
Log.d(LOG_TAG,"GET_CDMA_SUBSCRIPTION NID=" + cdmaSubscription[2] ); if (DBG) log("GET_CDMA_SUBSCRIPTION: NID=" + cdmaSubscription[2]);
mMin = cdmaSubscription[3]; mMin = cdmaSubscription[3];
mPrlVersion = cdmaSubscription[4]; mPrlVersion = cdmaSubscription[4];
Log.d(LOG_TAG,"GET_CDMA_SUBSCRIPTION MDN=" + mMdn); if (DBG) log("GET_CDMA_SUBSCRIPTION: MDN=" + mMdn);
mIsMinInfoReady = true; mIsMinInfoReady = true;
@@ -408,19 +408,23 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
// Notify apps subscription info is ready // Notify apps subscription info is ready
if (cdmaForSubscriptionInfoReadyRegistrants != null) { if (cdmaForSubscriptionInfoReadyRegistrants != null) {
Log.d(LOG_TAG, "call cdmaForSubscriptionInfoReady.notifyRegistrants()"); if (DBG) log("GET_CDMA_SUBSCRIPTION: call notifyRegistrants()");
cdmaForSubscriptionInfoReadyRegistrants.notifyRegistrants(); cdmaForSubscriptionInfoReadyRegistrants.notifyRegistrants();
} }
if (oldOtaspMode != mCurrentOtaspMode) { if (oldOtaspMode != mCurrentOtaspMode) {
Log.d(LOG_TAG, "call phone.notifyOtaspChanged old otaspMode=" + if (DBG) {
log("GET_CDMA_SUBSCRIPTION: call notifyOtaspChanged old otaspMode=" +
oldOtaspMode + " new otaspMode=" + mCurrentOtaspMode); oldOtaspMode + " new otaspMode=" + mCurrentOtaspMode);
}
phone.notifyOtaspChanged(mCurrentOtaspMode); phone.notifyOtaspChanged(mCurrentOtaspMode);
} }
phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI, phone.getIccCard().broadcastIccStateChangedIntent(IccCard.INTENT_VALUE_ICC_IMSI,
null); null);
} else { } else {
Log.w(LOG_TAG,"error parsing cdmaSubscription params num=" if (DBG) {
log("GET_CDMA_SUBSCRIPTION: error parsing cdmaSubscription params num="
+ cdmaSubscription.length); + cdmaSubscription.length);
}
} }
} }
break; break;
@@ -475,9 +479,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
if (ar.exception == null) { if (ar.exception == null) {
ints = (int[]) ar.result; ints = (int[]) ar.result;
int otaStatus = ints[0]; int otaStatus = ints[0];
if (otaStatus == phone.CDMA_OTA_PROVISION_STATUS_COMMITTED if (otaStatus == Phone.CDMA_OTA_PROVISION_STATUS_COMMITTED
|| otaStatus == phone.CDMA_OTA_PROVISION_STATUS_OTAPA_STOPPED) { || otaStatus == Phone.CDMA_OTA_PROVISION_STATUS_OTAPA_STOPPED) {
Log.d(LOG_TAG, "Received OTA_PROGRAMMING Complete,Reload MDN "); if (DBG) log("EVENT_OTA_PROVISION_STATUS_CHANGE: Complete, Reload MDN");
cm.getCDMASubscription( obtainMessage(EVENT_POLL_STATE_CDMA_SUBSCRIPTION)); cm.getCDMASubscription( obtainMessage(EVENT_POLL_STATE_CDMA_SUBSCRIPTION));
} }
} }
@@ -522,9 +526,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
// null and not blank. But this would cause us to incorrectly display // null and not blank. But this would cause us to incorrectly display
// "No Service". Now showPlmn is set to true for any non null string. // "No Service". Now showPlmn is set to true for any non null string.
boolean showPlmn = plmn != null; boolean showPlmn = plmn != null;
Log.d(LOG_TAG, if (DBG) {
String.format("updateSpnDisplay: changed sending intent" + log(String.format("updateSpnDisplay: changed sending intent" +
" showPlmn='%b' plmn='%s'", showPlmn, plmn)); " showPlmn='%b' plmn='%s'", showPlmn, plmn));
}
Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION); Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION);
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
intent.putExtra(Intents.EXTRA_SHOW_SPN, false); intent.putExtra(Intents.EXTRA_SHOW_SPN, false);
@@ -618,7 +623,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
reasonForDenial = Integer.parseInt(states[13]); reasonForDenial = Integer.parseInt(states[13]);
} }
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.w(LOG_TAG, "error parsing RegistrationState: " + ex); loge("EVENT_POLL_STATE_REGISTRATION_CDMA: error parsing: " + ex);
} }
} else { } else {
throw new RuntimeException("Warning! Wrong number of parameters returned from " throw new RuntimeException("Warning! Wrong number of parameters returned from "
@@ -689,12 +694,12 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
newSS.setOperatorName(opNames[0], opNames[1], opNames[2]); newSS.setOperatorName(opNames[0], opNames[1], opNames[2]);
} }
} else { } else {
Log.w(LOG_TAG, "error parsing opNames"); if (DBG) log("EVENT_POLL_STATE_OPERATOR_CDMA: error parsing opNames");
} }
break; break;
default: default:
Log.e(LOG_TAG, "RIL response handle in wrong phone!" loge("handlePollStateResultMessage: RIL response handle in wrong phone!"
+ " Expected CDMA RIL request and get GSM RIL request."); + " Expected CDMA RIL request and get GSM RIL request.");
break; break;
} }
} }
@@ -703,7 +708,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
* Handle the result of one of the pollState() - related requests * Handle the result of one of the pollState() - related requests
*/ */
@Override @Override
protected void handlePollStateResult (int what, AsyncResult ar) { protected void handlePollStateResult(int what, AsyncResult ar) {
// Ignore stale requests from last poll. // Ignore stale requests from last poll.
if (ar.userObj != pollingContext) return; if (ar.userObj != pollingContext) return;
@@ -727,15 +732,14 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
} }
if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) {
Log.e(LOG_TAG, loge("handlePollStateResult: RIL returned an error where it must succeed"
"RIL implementation has returned an error where it must succeed", + ar.exception);
ar.exception);
} }
} else try { } else try {
handlePollStateResultMessage(what, ar); handlePollStateResultMessage(what, ar);
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
Log.e(LOG_TAG, "Exception while polling service state. " loge("handlePollStateResult: Exception while polling service state. "
+ "Probably malformed RIL response.", ex); + "Probably malformed RIL response." + ex);
} }
pollingContext[0]--; pollingContext[0]--;
@@ -842,7 +846,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
case SIM_NOT_READY: case SIM_NOT_READY:
case SIM_LOCKED_OR_ABSENT: case SIM_LOCKED_OR_ABSENT:
case SIM_READY: case SIM_READY:
log("Radio Technology Change ongoing, setting SS to off"); if (DBG) log("Radio Technology Change ongoing, setting SS to off");
newSS.setStateOff(); newSS.setStateOff();
newCellLoc.setStateInvalid(); newCellLoc.setStateInvalid();
setSignalStrengthDefaultValues(); setSignalStrengthDefaultValues();
@@ -892,7 +896,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
break; break;
default: default:
if (DBG) { if (DBG) {
Log.e(LOG_TAG, "Wrong network. Can not return a string."); slog("Wrong network. Can not return a string.");
} }
break; break;
} }
@@ -938,7 +942,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
} }
protected void pollStateDone() { protected void pollStateDone() {
if (DBG) log("Poll ServiceState done: oldSS=[" + ss + "] newSS=[" + newSS + "]"); if (DBG) log("pollStateDone: oldSS=[" + ss + "] newSS=[" + newSS + "]");
boolean hasRegistered = boolean hasRegistered =
ss.getState() != ServiceState.STATE_IN_SERVICE ss.getState() != ServiceState.STATE_IN_SERVICE
@@ -1035,9 +1039,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
isoCountryCode = MccTable.countryCodeForMcc(Integer.parseInt( isoCountryCode = MccTable.countryCodeForMcc(Integer.parseInt(
operatorNumeric.substring(0,3))); operatorNumeric.substring(0,3)));
} catch ( NumberFormatException ex){ } catch ( NumberFormatException ex){
Log.w(LOG_TAG, "countryCodeForMcc error" + ex); loge("pollStateDone: countryCodeForMcc error" + ex);
} catch ( StringIndexOutOfBoundsException ex) { } catch ( StringIndexOutOfBoundsException ex) {
Log.w(LOG_TAG, "countryCodeForMcc error" + ex); loge("pollStateDone: countryCodeForMcc error" + ex);
} }
phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY,
@@ -1165,7 +1169,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
try { try {
phone.notifySignalStrength(); phone.notifySignalStrength();
} catch (NullPointerException ex) { } catch (NullPointerException ex) {
log("onSignalStrengthResult() Phone already destroyed: " + ex loge("onSignalStrengthResult() Phone already destroyed: " + ex
+ "SignalStrength not notified"); + "SignalStrength not notified");
} }
} }
@@ -1189,7 +1193,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
retVal = ServiceState.STATE_IN_SERVICE; retVal = ServiceState.STATE_IN_SERVICE;
break; break;
default: default:
Log.e(LOG_TAG, "Wrong radioTechnology code."); loge("radioTechnologyToDataServiceState: Wrong radioTechnology code.");
break; break;
} }
return(retVal); return(retVal);
@@ -1211,7 +1215,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
return ServiceState.STATE_IN_SERVICE; return ServiceState.STATE_IN_SERVICE;
default: default:
Log.w(LOG_TAG, "unexpected service state " + code); loge("regCodeToServiceState: unexpected service state " + code);
return ServiceState.STATE_OUT_OF_SERVICE; return ServiceState.STATE_OUT_OF_SERVICE;
} }
} }
@@ -1302,8 +1306,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
// tz is in number of quarter-hours // tz is in number of quarter-hours
long start = SystemClock.elapsedRealtime(); long start = SystemClock.elapsedRealtime();
Log.i(LOG_TAG, "NITZ: " + nitz + "," + nitzReceiveTime + if (DBG) {
log("NITZ: " + nitz + "," + nitzReceiveTime +
" start=" + start + " delay=" + (start - nitzReceiveTime)); " start=" + start + " delay=" + (start - nitzReceiveTime));
}
try { try {
/* NITZ time (hour:min:sec) will be in UTC but it supplies the timezone /* NITZ time (hour:min:sec) will be in UTC but it supplies the timezone
@@ -1400,7 +1406,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
String ignore = SystemProperties.get("gsm.ignore-nitz"); String ignore = SystemProperties.get("gsm.ignore-nitz");
if (ignore != null && ignore.equals("yes")) { if (ignore != null && ignore.equals("yes")) {
Log.i(LOG_TAG, "NITZ: Not setting clock because gsm.ignore-nitz is set"); if (DBG) log("NITZ: Not setting clock because gsm.ignore-nitz is set");
return; return;
} }
@@ -1415,17 +1421,21 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
if (millisSinceNitzReceived < 0) { if (millisSinceNitzReceived < 0) {
// Sanity check: something is wrong // Sanity check: something is wrong
Log.i(LOG_TAG, "NITZ: not setting time, clock has rolled " if (DBG) {
log("NITZ: not setting time, clock has rolled "
+ "backwards since NITZ time was received, " + "backwards since NITZ time was received, "
+ nitz); + nitz);
}
return; return;
} }
if (millisSinceNitzReceived > Integer.MAX_VALUE) { if (millisSinceNitzReceived > Integer.MAX_VALUE) {
// If the time is this far off, something is wrong > 24 days! // If the time is this far off, something is wrong > 24 days!
Log.i(LOG_TAG, "NITZ: not setting time, processing has taken " if (DBG) {
log("NITZ: not setting time, processing has taken "
+ (millisSinceNitzReceived / (1000 * 60 * 60 * 24)) + (millisSinceNitzReceived / (1000 * 60 * 60 * 24))
+ " days"); + " days");
}
return; return;
} }
@@ -1445,14 +1455,18 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
if ((mSavedAtTime == 0) || (timeSinceLastUpdate > nitzUpdateSpacing) if ((mSavedAtTime == 0) || (timeSinceLastUpdate > nitzUpdateSpacing)
|| (Math.abs(gained) > nitzUpdateDiff)) { || (Math.abs(gained) > nitzUpdateDiff)) {
Log.i(LOG_TAG, "NITZ: Auto updating time of day to " + c.getTime() if (DBG) {
log("NITZ: Auto updating time of day to " + c.getTime()
+ " NITZ receive delay=" + millisSinceNitzReceived + " NITZ receive delay=" + millisSinceNitzReceived
+ "ms gained=" + gained + "ms from " + nitz); + "ms gained=" + gained + "ms from " + nitz);
}
setAndBroadcastNetworkSetTime(c.getTimeInMillis()); setAndBroadcastNetworkSetTime(c.getTimeInMillis());
} else { } else {
Log.i(LOG_TAG, "NITZ: ignore, a previous update was " if (DBG) {
log("NITZ: ignore, a previous update was "
+ timeSinceLastUpdate + "ms ago and gained=" + gained + "ms"); + timeSinceLastUpdate + "ms ago and gained=" + gained + "ms");
}
return; return;
} }
} }
@@ -1460,17 +1474,17 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
/** /**
* Update properties and save the time we did the update * Update properties and save the time we did the update
*/ */
Log.i(LOG_TAG, "NITZ: update nitz time property"); if (DBG) log("NITZ: update nitz time property");
SystemProperties.set("gsm.nitz.time", String.valueOf(c.getTimeInMillis())); SystemProperties.set("gsm.nitz.time", String.valueOf(c.getTimeInMillis()));
mSavedTime = c.getTimeInMillis(); mSavedTime = c.getTimeInMillis();
mSavedAtTime = SystemClock.elapsedRealtime(); mSavedAtTime = SystemClock.elapsedRealtime();
} finally { } finally {
long end = SystemClock.elapsedRealtime(); long end = SystemClock.elapsedRealtime();
Log.i(LOG_TAG, "NITZ: end=" + end + " dur=" + (end - start)); if (DBG) log("NITZ: end=" + end + " dur=" + (end - start));
mWakeLock.release(); mWakeLock.release();
} }
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
Log.e(LOG_TAG, "NITZ: Parsing NITZ time " + nitz, ex); loge("NITZ: Parsing NITZ time " + nitz + " ex=" + ex);
} }
} }
@@ -1528,8 +1542,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
if (Settings.System.getInt(cr, Settings.System.AUTO_TIME, 0) == 0) { if (Settings.System.getInt(cr, Settings.System.AUTO_TIME, 0) == 0) {
return; return;
} }
Log.d(LOG_TAG, "Reverting to NITZ Time: mSavedTime=" + mSavedTime if (DBG) {
+ " mSavedAtTime=" + mSavedAtTime); log("revertToNitzTime: mSavedTime=" + mSavedTime + " mSavedAtTime=" + mSavedAtTime);
}
if (mSavedTime != 0 && mSavedAtTime != 0) { if (mSavedTime != 0 && mSavedAtTime != 0) {
setAndBroadcastNetworkSetTime(mSavedTime setAndBroadcastNetworkSetTime(mSavedTime
+ (SystemClock.elapsedRealtime() - mSavedAtTime)); + (SystemClock.elapsedRealtime() - mSavedAtTime));
@@ -1541,7 +1556,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
Settings.System.AUTO_TIME_ZONE, 0) == 0) { Settings.System.AUTO_TIME_ZONE, 0) == 0) {
return; return;
} }
Log.d(LOG_TAG, "Reverting to NITZ TimeZone: tz='" + mSavedTimeZone); if (DBG) log("revertToNitzTimeZone: tz='" + mSavedTimeZone);
if (mSavedTimeZone != null) { if (mSavedTimeZone != null) {
setAndBroadcastNetworkSetTimeZone(mSavedTimeZone); setAndBroadcastNetworkSetTimeZone(mSavedTimeZone);
} }
@@ -1626,7 +1641,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
int getOtasp() { int getOtasp() {
int provisioningState; int provisioningState;
if (mMin == null || (mMin.length() < 6)) { if (mMin == null || (mMin.length() < 6)) {
if (DBG) Log.d(LOG_TAG, "getOtasp: bad mMin='" + mMin + "'"); if (DBG) log("getOtasp: bad mMin='" + mMin + "'");
provisioningState = OTASP_UNKNOWN; provisioningState = OTASP_UNKNOWN;
} else { } else {
if ((mMin.equals(UNACTIVATED_MIN_VALUE) if ((mMin.equals(UNACTIVATED_MIN_VALUE)
@@ -1637,15 +1652,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
provisioningState = OTASP_NOT_NEEDED; provisioningState = OTASP_NOT_NEEDED;
} }
} }
if (DBG) Log.d(LOG_TAG, "getOtasp: state=" + provisioningState); if (DBG) log("getOtasp: state=" + provisioningState);
return provisioningState; return provisioningState;
} }
@Override
protected void log(String s) {
Log.d(LOG_TAG, "[CdmaServiceStateTracker] " + s);
}
@Override @Override
protected void hangupAndPowerOff() { protected void hangupAndPowerOff() {
// hang up all active voice calls // hang up all active voice calls
@@ -1654,4 +1664,18 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
phone.mCT.foregroundCall.hangupIfAlive(); phone.mCT.foregroundCall.hangupIfAlive();
cm.setRadioPower(false, null); cm.setRadioPower(false, null);
} }
@Override
protected void log(String s) {
Log.d(LOG_TAG, "[CdmaSST] " + s);
}
@Override
protected void loge(String s) {
Log.e(LOG_TAG, "[CdmaSST] " + s);
}
private static void slog(String s) {
Log.d(LOG_TAG, "[CdmaSST] " + s);
}
} }

3
telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
View File

@@ -55,8 +55,7 @@ public class GsmDataConnection extends DataConnection {
synchronized (mCountLock) { synchronized (mCountLock) {
mCount += 1; mCount += 1;
} }
GsmDataConnection gsmDc = new GsmDataConnection(phone, "GsmDataConnection-" + mCount, GsmDataConnection gsmDc = new GsmDataConnection(phone, "GsmDC-" + mCount, id, rm);
id, rm);
gsmDc.start(); gsmDc.start();
if (DBG) gsmDc.log("Made " + gsmDc.getName()); if (DBG) gsmDc.log("Made " + gsmDc.getName());
return gsmDc; return gsmDc;

4
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -1991,11 +1991,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected void log(String s) { protected void log(String s) {
Log.d(LOG_TAG, "[GsmDataConnectionTracker] " + s); Log.d(LOG_TAG, "[GsmDCT] " + s);
} }
@Override @Override
protected void loge(String s) { protected void loge(String s) {
Log.e(LOG_TAG, "[GsmDataConnectionTracker] " + s); Log.e(LOG_TAG, "[GsmDCT] " + s);
} }
} }

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

@@ -256,7 +256,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
} }
protected void finalize() { protected void finalize() {
if(DBG) Log.d(LOG_TAG, "GsmServiceStateTracker finalized"); if(DBG) log("finalize");
} }
@Override @Override
@@ -449,7 +449,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
// This is a notification from // This is a notification from
// CommandsInterface.setOnRestrictedStateChanged // CommandsInterface.setOnRestrictedStateChanged
Log.d(LOG_TAG, "[DSAC DEB] " + "EVENT_RESTRICTED_STATE_CHANGED"); if (DBG) log("EVENT_RESTRICTED_STATE_CHANGED");
ar = (AsyncResult) msg.obj; ar = (AsyncResult) msg.obj;
@@ -495,7 +495,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
if (mEmergencyOnly && cm.getRadioState().isOn()) { if (mEmergencyOnly && cm.getRadioState().isOn()) {
plmn = Resources.getSystem(). plmn = Resources.getSystem().
getText(com.android.internal.R.string.emergency_calls_only).toString(); getText(com.android.internal.R.string.emergency_calls_only).toString();
Log.d(LOG_TAG, "updateSpnDisplay: emergency only and radio is on plmn='" + plmn + "'"); if (DBG) log("updateSpnDisplay: emergency only and radio is on plmn='" + plmn + "'");
} }
if (rule != curSpnRule if (rule != curSpnRule
@@ -506,10 +506,11 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
boolean showPlmn = !TextUtils.isEmpty(plmn) && boolean showPlmn = !TextUtils.isEmpty(plmn) &&
(rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN; (rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN;
Log.d(LOG_TAG, if (DBG) {
String.format("updateSpnDisplay: changed sending intent" + " rule=" + rule + log(String.format("updateSpnDisplay: changed sending intent" + " rule=" + rule +
" showPlmn='%b' plmn='%s' showSpn='%b' spn='%s'", " showPlmn='%b' plmn='%s' showSpn='%b' spn='%s'",
showPlmn, plmn, showSpn, spn)); showPlmn, plmn, showSpn, spn));
}
Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION); Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION);
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
intent.putExtra(Intents.EXTRA_SHOW_SPN, showSpn); intent.putExtra(Intents.EXTRA_SHOW_SPN, showSpn);
@@ -554,8 +555,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
} }
if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) { if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) {
Log.e(LOG_TAG, loge("RIL implementation has returned an error where it must succeed" +
"RIL implementation has returned an error where it must succeed" +
ar.exception); ar.exception);
} }
} else try { } else try {
@@ -584,7 +584,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
} }
} }
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.w(LOG_TAG, "error parsing RegistrationState: " + ex); loge("error parsing RegistrationState: " + ex);
} }
} }
@@ -624,7 +624,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
mNewMaxDataCalls = Integer.parseInt(states[5]); mNewMaxDataCalls = Integer.parseInt(states[5]);
} }
} catch (NumberFormatException ex) { } catch (NumberFormatException ex) {
Log.w(LOG_TAG, "error parsing GprsRegistrationState: " + ex); loge("error parsing GprsRegistrationState: " + ex);
} }
} }
newGPRSState = regCodeToServiceState(regState); newGPRSState = regCodeToServiceState(regState);
@@ -649,8 +649,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
} }
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
Log.e(LOG_TAG, "Exception while polling service state. " loge("Exception while polling service state. Probably malformed RIL response." + ex);
+ "Probably malformed RIL response.", ex);
} }
pollingContext[0]--; pollingContext[0]--;
@@ -713,7 +712,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
case RUIM_LOCKED_OR_ABSENT: case RUIM_LOCKED_OR_ABSENT:
case NV_NOT_READY: case NV_NOT_READY:
case NV_READY: case NV_READY:
Log.d(LOG_TAG, "Radio Technology Change ongoing, setting SS to off"); if (DBG) log("Radio Technology Change ongoing, setting SS to off");
newSS.setStateOff(); newSS.setStateOff();
newCellLoc.setStateInvalid(); newCellLoc.setStateInvalid();
setSignalStrengthDefaultValues(); setSignalStrengthDefaultValues();
@@ -774,7 +773,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
ret = "HSPA"; ret = "HSPA";
break; break;
default: default:
Log.e(LOG_TAG, "Wrong network type: " + Integer.toString(type)); sloge("Wrong network type: " + Integer.toString(type));
break; break;
} }
@@ -783,7 +782,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
private void pollStateDone() { private void pollStateDone() {
if (DBG) { if (DBG) {
Log.d(LOG_TAG, "Poll ServiceState done: " + log("Poll ServiceState done: " +
" oldSS=[" + ss + "] newSS=[" + newSS + " oldSS=[" + ss + "] newSS=[" + newSS +
"] oldGprs=" + gprsState + " newData=" + newGPRSState + "] oldGprs=" + gprsState + " newData=" + newGPRSState +
" oldMaxDataCalls=" + mMaxDataCalls + " oldMaxDataCalls=" + mMaxDataCalls +
@@ -845,9 +844,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
GsmCellLocation loc = ((GsmCellLocation)phone.getCellLocation()); GsmCellLocation loc = ((GsmCellLocation)phone.getCellLocation());
if (loc != null) cid = loc.getCid(); if (loc != null) cid = loc.getCid();
EventLog.writeEvent(EventLogTags.GSM_RAT_SWITCHED, cid, networkType, newNetworkType); EventLog.writeEvent(EventLogTags.GSM_RAT_SWITCHED, cid, networkType, newNetworkType);
Log.d(LOG_TAG, if (DBG) {
"RAT switched " + networkTypeToString(networkType) + " -> " log("RAT switched " + networkTypeToString(networkType) + " -> "
+ networkTypeToString(newNetworkType) + " at cell " + cid); + networkTypeToString(newNetworkType) + " at cell " + cid);
}
} }
gprsState = newGPRSState; gprsState = newGPRSState;
@@ -888,9 +888,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
iso = MccTable.countryCodeForMcc(Integer.parseInt( iso = MccTable.countryCodeForMcc(Integer.parseInt(
operatorNumeric.substring(0,3))); operatorNumeric.substring(0,3)));
} catch ( NumberFormatException ex){ } catch ( NumberFormatException ex){
Log.w(LOG_TAG, "countryCodeForMcc error" + ex); loge("countryCodeForMcc error" + ex);
} catch ( StringIndexOutOfBoundsException ex) { } catch ( StringIndexOutOfBoundsException ex) {
Log.w(LOG_TAG, "countryCodeForMcc error" + ex); loge("countryCodeForMcc error" + ex);
} }
phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, iso); phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, iso);
@@ -1003,10 +1003,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
// Couldn't find a proper timezone. Perhaps the DST data is wrong. // Couldn't find a proper timezone. Perhaps the DST data is wrong.
guess = findTimeZone(offset, !dst, when); guess = findTimeZone(offset, !dst, when);
} }
if (DBG) { if (DBG) log("getNitzTimeZone returning " + (guess == null ? guess : guess.getID()));
Log.d(LOG_TAG, "getNitzTimeZone returning "
+ (guess == null ? guess : guess.getID()));
}
return guess; return guess;
} }
@@ -1077,7 +1074,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
lteRssnr = ints[10]; lteRssnr = ints[10];
lteCqi = ints[11]; lteCqi = ints[11];
} else { } else {
Log.e(LOG_TAG, "Bogus signal strength response"); loge("Bogus signal strength response");
rssi = 99; rssi = 99;
} }
} }
@@ -1104,10 +1101,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
* @param ar an int value of RIL_RESTRICTED_STATE_* * @param ar an int value of RIL_RESTRICTED_STATE_*
*/ */
private void onRestrictedStateChanged(AsyncResult ar) { private void onRestrictedStateChanged(AsyncResult ar) {
Log.d(LOG_TAG, "[DSAC DEB] " + "onRestrictedStateChanged");
RestrictedState newRs = new RestrictedState(); RestrictedState newRs = new RestrictedState();
Log.d(LOG_TAG, "[DSAC DEB] " + "current rs at enter "+ mRestrictedState); if (DBG) log("onRestrictedStateChanged: E rs "+ mRestrictedState);
if (ar.exception == null) { if (ar.exception == null) {
int[] ints = (int[])ar.result; int[] ints = (int[])ar.result;
@@ -1125,7 +1121,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
(state & RILConstants.RIL_RESTRICTED_STATE_PS_ALL)!= 0); (state & RILConstants.RIL_RESTRICTED_STATE_PS_ALL)!= 0);
} }
Log.d(LOG_TAG, "[DSAC DEB] " + "new rs "+ newRs); if (DBG) log("onRestrictedStateChanged: new rs "+ newRs);
if (!mRestrictedState.isPsRestricted() && newRs.isPsRestricted()) { if (!mRestrictedState.isPsRestricted() && newRs.isPsRestricted()) {
mPsRestrictEnabledRegistrants.notifyRegistrants(); mPsRestrictEnabledRegistrants.notifyRegistrants();
@@ -1190,7 +1186,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
mRestrictedState = newRs; mRestrictedState = newRs;
} }
Log.d(LOG_TAG, "[DSAC DEB] " + "current rs at return "+ mRestrictedState); log("onRestrictedStateChanged: X rs "+ mRestrictedState);
} }
/** code is registration state 0-5 from TS 27.007 7.2 */ /** code is registration state 0-5 from TS 27.007 7.2 */
@@ -1214,7 +1210,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
return ServiceState.STATE_IN_SERVICE; return ServiceState.STATE_IN_SERVICE;
default: default:
Log.w(LOG_TAG, "unexpected service state " + code); loge("regCodeToServiceState: unexpected service state " + code);
return ServiceState.STATE_OUT_OF_SERVICE; return ServiceState.STATE_OUT_OF_SERVICE;
} }
} }
@@ -1334,8 +1330,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
// tz is in number of quarter-hours // tz is in number of quarter-hours
long start = SystemClock.elapsedRealtime(); long start = SystemClock.elapsedRealtime();
Log.i(LOG_TAG, "NITZ: " + nitz + "," + nitzReceiveTime + if (DBG) {log("NITZ: " + nitz + "," + nitzReceiveTime +
" start=" + start + " delay=" + (start - nitzReceiveTime)); " start=" + start + " delay=" + (start - nitzReceiveTime));
}
try { try {
/* NITZ time (hour:min:sec) will be in UTC but it supplies the timezone /* NITZ time (hour:min:sec) will be in UTC but it supplies the timezone
@@ -1432,7 +1429,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
String ignore = SystemProperties.get("gsm.ignore-nitz"); String ignore = SystemProperties.get("gsm.ignore-nitz");
if (ignore != null && ignore.equals("yes")) { if (ignore != null && ignore.equals("yes")) {
Log.i(LOG_TAG, "NITZ: Not setting clock because gsm.ignore-nitz is set"); log("NITZ: Not setting clock because gsm.ignore-nitz is set");
return; return;
} }
@@ -1445,43 +1442,49 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
if (millisSinceNitzReceived < 0) { if (millisSinceNitzReceived < 0) {
// Sanity check: something is wrong // Sanity check: something is wrong
Log.i(LOG_TAG, "NITZ: not setting time, clock has rolled " if (DBG) {
log("NITZ: not setting time, clock has rolled "
+ "backwards since NITZ time was received, " + "backwards since NITZ time was received, "
+ nitz); + nitz);
}
return; return;
} }
if (millisSinceNitzReceived > Integer.MAX_VALUE) { if (millisSinceNitzReceived > Integer.MAX_VALUE) {
// If the time is this far off, something is wrong > 24 days! // If the time is this far off, something is wrong > 24 days!
Log.i(LOG_TAG, "NITZ: not setting time, processing has taken " if (DBG) {
log("NITZ: not setting time, processing has taken "
+ (millisSinceNitzReceived / (1000 * 60 * 60 * 24)) + (millisSinceNitzReceived / (1000 * 60 * 60 * 24))
+ " days"); + " days");
}
return; return;
} }
// Note: with range checks above, cast to int is safe // Note: with range checks above, cast to int is safe
c.add(Calendar.MILLISECOND, (int)millisSinceNitzReceived); c.add(Calendar.MILLISECOND, (int)millisSinceNitzReceived);
Log.i(LOG_TAG, "NITZ: Setting time of day to " + c.getTime() if (DBG) {
+ " NITZ receive delay(ms): " + millisSinceNitzReceived log("NITZ: Setting time of day to " + c.getTime()
+ " gained(ms): " + " NITZ receive delay(ms): " + millisSinceNitzReceived
+ (c.getTimeInMillis() - System.currentTimeMillis()) + " gained(ms): "
+ " from " + nitz); + (c.getTimeInMillis() - System.currentTimeMillis())
+ " from " + nitz);
}
setAndBroadcastNetworkSetTime(c.getTimeInMillis()); setAndBroadcastNetworkSetTime(c.getTimeInMillis());
Log.i(LOG_TAG, "NITZ: after Setting time of day"); Log.i(LOG_TAG, "NITZ: after Setting time of day");
} }
SystemProperties.set("gsm.nitz.time", String.valueOf(c.getTimeInMillis())); SystemProperties.set("gsm.nitz.time", String.valueOf(c.getTimeInMillis()));
saveNitzTime(c.getTimeInMillis()); saveNitzTime(c.getTimeInMillis());
if (Config.LOGV) { if (DBG) {
long end = SystemClock.elapsedRealtime(); long end = SystemClock.elapsedRealtime();
Log.v(LOG_TAG, "NITZ: end=" + end + " dur=" + (end - start)); log("NITZ: end=" + end + " dur=" + (end - start));
} }
} finally { } finally {
mWakeLock.release(); mWakeLock.release();
} }
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
Log.e(LOG_TAG, "NITZ: Parsing NITZ time " + nitz, ex); loge("NITZ: Parsing NITZ time " + nitz + " ex=" + ex);
} }
} }
@@ -1547,8 +1550,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
Settings.System.AUTO_TIME, 0) == 0) { Settings.System.AUTO_TIME, 0) == 0) {
return; return;
} }
Log.d(LOG_TAG, "Reverting to NITZ Time: mSavedTime=" + mSavedTime if (DBG) {
log("Reverting to NITZ Time: mSavedTime=" + mSavedTime
+ " mSavedAtTime=" + mSavedAtTime); + " mSavedAtTime=" + mSavedAtTime);
}
if (mSavedTime != 0 && mSavedAtTime != 0) { if (mSavedTime != 0 && mSavedAtTime != 0) {
setAndBroadcastNetworkSetTime(mSavedTime setAndBroadcastNetworkSetTime(mSavedTime
+ (SystemClock.elapsedRealtime() - mSavedAtTime)); + (SystemClock.elapsedRealtime() - mSavedAtTime));
@@ -1560,7 +1565,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
Settings.System.AUTO_TIME_ZONE, 0) == 0) { Settings.System.AUTO_TIME_ZONE, 0) == 0) {
return; return;
} }
Log.d(LOG_TAG, "Reverting to NITZ TimeZone: tz='" + mSavedTimeZone); if (DBG) log("Reverting to NITZ TimeZone: tz='" + mSavedTimeZone);
if (mSavedTimeZone != null) { if (mSavedTimeZone != null) {
setAndBroadcastNetworkSetTimeZone(mSavedTimeZone); setAndBroadcastNetworkSetTimeZone(mSavedTimeZone);
} }
@@ -1573,7 +1578,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
*/ */
private void setNotification(int notifyType) { private void setNotification(int notifyType) {
Log.d(LOG_TAG, "[DSAC DEB] " + "create notification " + notifyType); if (DBG) log("setNotification: create notification " + notifyType);
Context context = phone.getContext(); Context context = phone.getContext();
mNotification = new Notification(); mNotification = new Notification();
@@ -1610,7 +1615,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
break; break;
} }
Log.d(LOG_TAG, "[DSAC DEB] " + "put notification " + title + " / " +details); if (DBG) log("setNotification: put notification " + title + " / " +details);
mNotification.tickerText = title; mNotification.tickerText = title;
mNotification.setLatestEventInfo(context, title, details, mNotification.setLatestEventInfo(context, title, details,
mNotification.contentIntent); mNotification.contentIntent);
@@ -1629,6 +1634,15 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
@Override @Override
protected void log(String s) { protected void log(String s) {
Log.d(LOG_TAG, "[GsmServiceStateTracker] " + s); Log.d(LOG_TAG, "[GsmSST] " + s);
}
@Override
protected void loge(String s) {
Log.e(LOG_TAG, "[GsmSST] " + s);
}
private static void sloge(String s) {
Log.e(LOG_TAG, "[GsmSST] " + s);
} }
} }