diff options
| author | Wink Saville <wink@google.com> | 2010-11-16 16:15:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-16 16:15:36 -0800 |
| commit | 0dcea08af30465407201a77d660a8b7500a024b5 (patch) | |
| tree | 5920879a2b94876687415d562d89f5dd87e56a6d | |
| parent | 66b8994ed2523d1e71bddd2770de33fcd2fec254 (diff) | |
| parent | e613adcc555731aab2a0684d709da3d0df97a9e5 (diff) | |
| download | frameworks_base-0dcea08af30465407201a77d660a8b7500a024b5.zip frameworks_base-0dcea08af30465407201a77d660a8b7500a024b5.tar.gz frameworks_base-0dcea08af30465407201a77d660a8b7500a024b5.tar.bz2 | |
Merge "Cleanup some debug output."
3 files changed, 16 insertions, 9 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 35a2c19..290f2c1 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -438,9 +438,9 @@ public class ServiceState implements Parcelable { + " " + (mCssIndicator ? "CSS supported" : "CSS not supported") + " " + mNetworkId + " " + mSystemId - + "RoamInd: " + mCdmaRoamingIndicator - + "DefRoamInd: " + mCdmaDefaultRoamingIndicator - + "EmergOnly: " + mIsEmergencyOnly); + + " RoamInd=" + mCdmaRoamingIndicator + + " DefRoamInd=" + mCdmaDefaultRoamingIndicator + + " EmergOnly=" + mIsEmergencyOnly); } public void setStateOutOfService() { diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index 7c652c5..d7ff0c5 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -240,8 +240,8 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { mCdmaPhone.mRuimRecords.getRecordsLoaded())) { reason += " - radioState= " + mPhone.mCM.getRadioState() + " - RUIM not loaded"; } - if (mPhone.getState() != Phone.State.IDLE && - mCdmaPhone.mSST.isConcurrentVoiceAndData()) { + if (!(mCdmaPhone.mSST.isConcurrentVoiceAndData() || + mPhone.getState() == Phone.State.IDLE)) { reason += " - concurrentVoiceAndData not allowed and state= " + mPhone.getState(); } if (roaming) reason += " - Roaming"; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 2aca9ad..effb743 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -328,8 +328,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { reason += " - PhoneState= " + mPhone.getState(); } if (!mMasterDataEnabled) reason += " - mMasterDataEnabled= false"; - if (mPhone.getServiceState().getRoaming() && getDataOnRoamingEnabled()) { - reason += " - Roaming"; + if (mPhone.getServiceState().getRoaming() && !getDataOnRoamingEnabled()) { + reason += " - Roaming and data roaming not enabled"; } if (mIsPsRestricted) reason += " - mIsPsRestricted= true"; if (!desiredPowerState) reason += " - desiredPowerState= false"; @@ -1037,8 +1037,15 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { } else { GsmDataConnection.FailCause cause; cause = (GsmDataConnection.FailCause) (ar.result); - if(DBG) log("PDP setup failed " + cause); - // Log this failure to the Event Logs. + if (DBG) { + String apnString; + try { + apnString = mWaitingApns.get(0).apn; + } catch (Exception e) { + apnString = "<unknown>"; + } + log(String.format("onDataSetupComplete: error apn=%s cause=%s", apnString, cause)); + } if (cause.isEventLoggable()) { GsmCellLocation loc = ((GsmCellLocation)mPhone.getCellLocation()); EventLog.writeEvent(EventLogTags.PDP_SETUP_FAIL, |