Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e613adcc authored by Wink Saville's avatar Wink Saville
Browse files

Cleanup some debug output. 

Change-Id: Iac39e7ffb1f7409647ce112f9347c42d2909846a
parent 4e74e181

telephony/java/android/telephony/ServiceState.java

+3 −3
Original line number Diff line number Diff line
@@ -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() {

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

+2 −2
Original line number Diff line number Diff line
@@ -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";

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

+11 −4
Original line number Diff line number Diff line
@@ -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,