Merge "Add debug for tracking down connectivity issues." into jb-dev (02a43d3a) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/ApnContext.java

+23 −23

Original line number	Original line	Diff line number	Diff line
	@@ -78,8 +78,11 @@ public class ApnContext {
	return mDataConnection;		return mDataConnection;
	}		}

	public synchronized void setDataConnection(DataConnection dataConnection) {		public synchronized void setDataConnection(DataConnection dc) {
	mDataConnection = dataConnection;		if (DBG) {
			log("setDataConnection: old dc=" + mDataConnection + " new dc=" + dc + " this=" + this);
			}
			mDataConnection = dc;
	}		}


	@@ -88,10 +91,15 @@ public class ApnContext {
	}		}

	public synchronized void setDataConnectionAc(DataConnectionAc dcac) {		public synchronized void setDataConnectionAc(DataConnectionAc dcac) {
			if (DBG) {
			log("setDataConnectionAc: old dcac=" + mDataConnectionAc + " new dcac=" + dcac);
			}
	if (dcac != null) {		if (dcac != null) {
	dcac.addApnContextSync(this);		dcac.addApnContextSync(this);
	} else {		} else {
	if (mDataConnectionAc != null) mDataConnectionAc.removeApnContextSync(this);		if (mDataConnectionAc != null) {
			mDataConnectionAc.removeApnContextSync(this);
			}
	}		}
	mDataConnectionAc = dcac;		mDataConnectionAc = dcac;
	}		}
	@@ -141,7 +149,7 @@ public class ApnContext {

	public synchronized void setState(DataConnectionTracker.State s) {		public synchronized void setState(DataConnectionTracker.State s) {
	if (DBG) {		if (DBG) {
	log("setState: " + s + " for type " + mApnType + ", previous state:" + mState);		log("setState: " + s + ", previous state:" + mState);
	}		}

	mState = s;		mState = s;
	@@ -165,7 +173,7 @@ public class ApnContext {

	public synchronized void setReason(String reason) {		public synchronized void setReason(String reason) {
	if (DBG) {		if (DBG) {
	log("set reason as " + reason + ", for type " + mApnType + ",current state " + mState);		log("set reason as " + reason + ",current state " + mState);
	}		}
	mReason = reason;		mReason = reason;
	}		}
	@@ -180,8 +188,7 @@ public class ApnContext {

	public void setEnabled(boolean enabled) {		public void setEnabled(boolean enabled) {
	if (DBG) {		if (DBG) {
	log("set enabled as " + enabled + ", for type " +		log("set enabled as " + enabled + ", current state is " + mDataEnabled.get());
	mApnType + ", current state is " + mDataEnabled.get());
	}		}
	mDataEnabled.set(enabled);		mDataEnabled.set(enabled);
	}		}
	@@ -192,8 +199,7 @@ public class ApnContext {

	public void setDependencyMet(boolean met) {		public void setDependencyMet(boolean met) {
	if (DBG) {		if (DBG) {
	log("set mDependencyMet as " + met + ", for type " + mApnType +		log("set mDependencyMet as " + met + " current state is " + mDependencyMet.get());
	", current state is " + mDependencyMet.get());
	}		}
	mDependencyMet.set(met);		mDependencyMet.set(met);
	}		}
	@@ -204,25 +210,19 @@ public class ApnContext {

	@Override		@Override
	public String toString() {		public String toString() {
	return "state=" + getState() + " apnType=" + mApnType;		// We don't print mDataConnection because its recursive.
			return "{mApnType=" + mApnType + " mState=" + getState() + " mWaitingApns=" + mWaitingApns +
			" mWaitingApnsPermanentFailureCountDown=" + mWaitingApnsPermanentFailureCountDown +
			" mApnSetting=" + mApnSetting + " mDataConnectionAc=" + mDataConnectionAc +
			" mReason=" + mReason + " mDataEnabled=" + mDataEnabled +
			" mDependencyMet=" + mDependencyMet + "}";
	}		}

	protected void log(String s) {		protected void log(String s) {
	Log.d(LOG_TAG, "[ApnContext] " + s);		Log.d(LOG_TAG, "[ApnContext:" + mApnType + "] " + s);
	}		}

	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	pw.println("ApnContext:");		pw.println("ApnContext: " + this.toString());
	pw.println(" mApnType=" + mApnType);
	pw.println(" mState=" + mState);
	pw.println(" mWaitingApns=" + mWaitingApns);
	pw.println(" mWaitingApnsPermanentFailureCountDown=" +
	mWaitingApnsPermanentFailureCountDown);
	pw.println(" mApnSetting=" + mApnSetting);
	pw.println(" mDataConnection=" + mDataConnection);
	pw.println(" mDataConnectionAc=" + mDataConnectionAc);
	pw.println(" mReason=" + mReason);
	pw.println(" mDataEnabled=" + mDataEnabled);
	pw.println(" mDependencyMet=" + mDependencyMet);
	}		}
	}		}

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

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ public abstract class DataConnection extends StateMachine {
	protected static int mCount;		protected static int mCount;
	protected AsyncChannel mAc;		protected AsyncChannel mAc;

	private List<ApnContext> mApnList = null;		protected List<ApnContext> mApnList = null;
	PendingIntent mReconnectIntent = null;		PendingIntent mReconnectIntent = null;

	private DataConnectionTracker mDataConnectionTracker = null;		private DataConnectionTracker mDataConnectionTracker = null;
	@@ -247,7 +247,7 @@ public abstract class DataConnection extends StateMachine {
	protected FailCause lastFailCause;		protected FailCause lastFailCause;
	protected int mRetryOverride = -1;		protected int mRetryOverride = -1;
	protected static final String NULL_IP = "0.0.0.0";		protected static final String NULL_IP = "0.0.0.0";
	private int mRefCount;		protected int mRefCount;
	Object userData;		Object userData;

	//***** Abstract methods		//***** Abstract methods
	@@ -600,9 +600,8 @@ public abstract class DataConnection extends StateMachine {
	result.newLp.setHttpProxy(mLinkProperties.getHttpProxy());		result.newLp.setHttpProxy(mLinkProperties.getHttpProxy());

	if (DBG && (! result.oldLp.equals(result.newLp))) {		if (DBG && (! result.oldLp.equals(result.newLp))) {
	if (DBG) log("updateLinkProperty old != new");		log("updateLinkProperty old LP=" + result.oldLp);
	if (VDBG) log("updateLinkProperty old LP=" + result.oldLp);		log("updateLinkProperty new LP=" + result.newLp);
	if (VDBG) log("updateLinkProperty new LP=" + result.newLp);
	}		}
	mLinkProperties = result.newLp;		mLinkProperties = result.newLp;

telephony/java/com/android/internal/telephony/DataConnectionAc.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -580,6 +580,11 @@ public class DataConnectionAc extends AsyncChannel {
	}		}
	}		}

			@Override
			public String toString() {
			return dataConnection.getName();
			}

	private void log(String s) {		private void log(String s) {
	android.util.Log.d(mLogTag, "DataConnectionAc " + s);		android.util.Log.d(mLogTag, "DataConnectionAc " + s);
	}		}

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -499,6 +499,7 @@ public abstract class DataConnectionTracker extends Handler {
	*/		*/
	protected DataConnectionTracker(PhoneBase phone) {		protected DataConnectionTracker(PhoneBase phone) {
	super();		super();
			if (DBG) log("DCT.constructor");
	mPhone = phone;		mPhone = phone;

	IntentFilter filter = new IntentFilter();		IntentFilter filter = new IntentFilter();
	@@ -534,6 +535,7 @@ public abstract class DataConnectionTracker extends Handler {
	}		}

	public void dispose() {		public void dispose() {
			if (DBG) log("DCT.dispose");
	for (DataConnectionAc dcac : mDataConnectionAsyncChannels.values()) {		for (DataConnectionAc dcac : mDataConnectionAsyncChannels.values()) {
	dcac.disconnect();		dcac.disconnect();
	}		}
	@@ -1256,7 +1258,6 @@ public abstract class DataConnectionTracker extends Handler {
	Set<Entry<String, ApnContext>> mApnContextsSet = mApnContexts.entrySet();		Set<Entry<String, ApnContext>> mApnContextsSet = mApnContexts.entrySet();
	pw.println(" mApnContexts size=" + mApnContextsSet.size());		pw.println(" mApnContexts size=" + mApnContextsSet.size());
	for (Entry<String, ApnContext> entry : mApnContextsSet) {		for (Entry<String, ApnContext> entry : mApnContextsSet) {
	pw.printf(" *** mApnContexts[%s]:\n", entry.getKey());
	entry.getValue().dump(fd, pw, args);		entry.getValue().dump(fd, pw, args);
	}		}
	pw.println(" ***************************************");		pw.println(" ***************************************");

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

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -120,9 +120,10 @@ public class GsmDataConnection extends DataConnection {

	@Override		@Override
	public String toString() {		public String toString() {
	return "State=" + getCurrentState().getName() + " Apn=" + mApn +		return "{" + getName() + ": State=" + getCurrentState().getName() +
	" create=" + createTime + " lastFail=" + lastFailTime +		" apnSetting=" + mApn + " apnList= " + mApnList + " RefCount=" + mRefCount +
	" lastFailCause=" + lastFailCause;		" cid=" + cid + " create=" + createTime + " lastFail=" + lastFailTime +
			" lastFailCause=" + lastFailCause + "}";
	}		}

	@Override		@Override