am bac75416: am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb (9fbf9c2d) · Commits · e / os / android_frameworks_base

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

+17 −6

Original line number	Original line	Diff line number	Diff line
	@@ -531,7 +531,9 @@ public abstract class DataConnectionTracker extends Handler {
	* {@code true} otherwise.		* {@code true} otherwise.
	*/		*/
	public synchronized boolean getAnyDataEnabled() {		public synchronized boolean getAnyDataEnabled() {
	return (mInternalDataEnabled && mDataEnabled && (enabledCount != 0));		boolean result = (mInternalDataEnabled && mDataEnabled && (enabledCount != 0));
			if (!result && DBG) log("getAnyDataEnabled " + result);
			return result;
	}		}

	protected abstract void startNetStatPoll();		protected abstract void startNetStatPoll();
	@@ -657,7 +659,13 @@ public abstract class DataConnectionTracker extends Handler {

	// disabled apn's still need avail/unavail notificiations - send them out		// disabled apn's still need avail/unavail notificiations - send them out
	protected void notifyOffApnsOfAvailability(String reason, boolean availability) {		protected void notifyOffApnsOfAvailability(String reason, boolean availability) {
	if (mAvailability == availability) return;		if (mAvailability == availability) {
			if (DBG) {
			log("notifyOffApnsOfAvailability: no change in availability, " +
			"not nofitying about reason='" + reason + "' availability=" + availability);
			}
			return;
			}
	mAvailability = availability;		mAvailability = availability;
	for (int id = 0; id < APN_NUM_TYPES; id++) {		for (int id = 0; id < APN_NUM_TYPES; id++) {
	if (!isApnIdEnabled(id)) {		if (!isApnIdEnabled(id)) {
	@@ -685,10 +693,13 @@ public abstract class DataConnectionTracker extends Handler {
	* @return {@code true} if data connectivity is possible, {@code false} otherwise.		* @return {@code true} if data connectivity is possible, {@code false} otherwise.
	*/		*/
	protected boolean isDataPossible() {		protected boolean isDataPossible() {
	boolean possible = (isDataAllowed()		boolean dataAllowed = isDataAllowed();
	&& !(getAnyDataEnabled() && (mState == State.FAILED \|\| mState == State.IDLE)));		boolean anyDataEnabled = getAnyDataEnabled();
	if (!possible && DBG && isDataAllowed()) {		boolean possible = (dataAllowed
	log("Data not possible. No coverage: dataState = " + mState);		&& !(anyDataEnabled && (mState == State.FAILED \|\| mState == State.IDLE)));
			if (!possible && DBG) {
			log("isDataPossible() " + possible + ", dataAllowed=" + dataAllowed +
			" anyDataEnabled=" + anyDataEnabled + " dataState=" + mState);
	}		}
	return possible;		return possible;
	}		}