Merge "Improved debug message" (c93823f2) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -550,7 +550,7 @@ public class DataConnection extends StateMachine {

		@Override
		public String toString() {
		return name() + " SetupResult.mFailCause=" + mFailCause;
		return name() + " SetupResult.mFailCause=" + DataFailCause.toString(mFailCause);
		}
		}

		@@ -1065,8 +1065,9 @@ public class DataConnection extends StateMachine {
		new Throwable(DataFailCause.toString(cause)));
		}
		if (DBG) {
		log("notifyConnectCompleted at " + timeStamp + " cause=" + cause
		+ " connectionCompletedMsg=" + msgToString(connectionCompletedMsg));
		log("notifyConnectCompleted at " + timeStamp + " cause="
		+ DataFailCause.toString(cause) + " connectionCompletedMsg="
		+ msgToString(connectionCompletedMsg));
		}

		connectionCompletedMsg.sendToTarget();
		@@ -2114,7 +2115,7 @@ public class DataConnection extends StateMachine {
		if (mConnectionParams != null) {
		if (DBG) {
		log("DcInactiveState: enter notifyConnectCompleted +ALL failCause="
		+ mDcFailCause);
		+ DataFailCause.toString(mDcFailCause));
		}
		notifyConnectCompleted(mConnectionParams, mDcFailCause, mHandoverFailureMode,
		true);
		@@ -2122,7 +2123,7 @@ public class DataConnection extends StateMachine {
		if (mDisconnectParams != null) {
		if (DBG) {
		log("DcInactiveState: enter notifyDisconnectCompleted +ALL failCause="
		+ mDcFailCause);
		+ DataFailCause.toString(mDcFailCause));
		}
		notifyDisconnectCompleted(mDisconnectParams, true);
		}
		@@ -2130,7 +2131,7 @@ public class DataConnection extends StateMachine {
		&& mDcFailCause != DataFailCause.NONE) {
		if (DBG) {
		log("DcInactiveState: enter notifyAllDisconnectCompleted failCause="
		+ mDcFailCause);
		+ DataFailCause.toString(mDcFailCause));
		}
		notifyAllWithEvent(null, DctConstants.EVENT_DISCONNECT_DONE,
		DataFailCause.toString(mDcFailCause));
		@@ -3290,7 +3291,7 @@ public class DataConnection extends StateMachine {
		+ " mApnSetting=" + mApnSetting + " RefCount=" + mApnContexts.size()
		+ " mCid=" + mCid + " mCreateTime=" + mCreateTime
		+ " mLastastFailTime=" + mLastFailTime
		+ " mLastFailCause=" + mLastFailCause
		+ " mLastFailCause=" + DataFailCause.toString(mLastFailCause)
		+ " mTag=" + mTag
		+ " mLinkProperties=" + mLinkProperties
		+ " linkCapabilities=" + getNetworkCapabilities()
		@@ -3447,7 +3448,7 @@ public class DataConnection extends StateMachine {
		pw.println("mCid=" + mCid);
		pw.println("mConnectionParams=" + mConnectionParams);
		pw.println("mDisconnectParams=" + mDisconnectParams);
		pw.println("mDcFailCause=" + mDcFailCause);
		pw.println("mDcFailCause=" + DataFailCause.toString(mDcFailCause));
		pw.println("mPhone=" + mPhone);
		pw.println("mSubId=" + mSubId);
		pw.println("mLinkProperties=" + mLinkProperties);
		@@ -3458,7 +3459,7 @@ public class DataConnection extends StateMachine {
		pw.println("mNetworkCapabilities=" + getNetworkCapabilities());
		pw.println("mCreateTime=" + TimeUtils.logTimeOfDay(mCreateTime));
		pw.println("mLastFailTime=" + TimeUtils.logTimeOfDay(mLastFailTime));
		pw.println("mLastFailCause=" + mLastFailCause);
		pw.println("mLastFailCause=" + DataFailCause.toString(mLastFailCause));
		pw.println("mUserData=" + mUserData);
		pw.println("mSubscriptionOverride=" + Integer.toHexString(mSubscriptionOverride));
		pw.println("mRestrictedNetworkOverride=" + mRestrictedNetworkOverride);

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -2981,8 +2981,9 @@ public class DcTracker extends Handler {
		} else {
		if (DBG) {
		ApnSetting apn = apnContext.getApnSetting();
		log("onDataSetupComplete: error apn=" + apn.getApnName() + ", cause=" + cause
		+ ", requestType=" + requestTypeToString(requestType));
		log("onDataSetupComplete: error apn=" + apn.getApnName() + ", cause="
		+ DataFailCause.toString(cause) + ", requestType="
		+ requestTypeToString(requestType));
		}
		if (DataFailCause.isEventLoggable(cause)) {
		// Log this failure to the Event Logs.
		@@ -3010,7 +3011,8 @@ public class DcTracker extends Handler {
		// If the data call failure cause is a permanent failure, we mark the APN as permanent
		// failed.
		if (isPermanentFailure(cause)) {
		log("cause = " + cause + ", mark apn as permanent failed. apn = " + apn);
		log("cause=" + DataFailCause.toString(cause)
		+ ", mark apn as permanent failed. apn = " + apn);
		apnContext.markApnPermanentFailed(apn);
		}