Merge "Fix state synchronization problem." into ics-mr1 (22d5d7b6) · Commits · e / os / android_frameworks_base

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -699,8 +699,10 @@ public abstract class DataConnection extends StateMachine {
		break;

		case EVENT_DISCONNECT:
		if (DBG) log("DcDefaultState: msg.what=EVENT_DISCONNECT");
		notifyDisconnectCompleted((DisconnectParams) msg.obj);
		if (DBG) {
		log("DcDefaultState deferring msg.what=EVENT_DISCONNECT" + mRefCount);
		}
		deferMessage(msg);
		break;

		case EVENT_RIL_CONNECTED:
		@@ -807,6 +809,12 @@ public abstract class DataConnection extends StateMachine {
		retVal = HANDLED;
		break;

		case EVENT_DISCONNECT:
		if (DBG) log("DcInactiveState: msg.what=EVENT_DISCONNECT");
		notifyDisconnectCompleted((DisconnectParams)msg.obj);
		retVal = HANDLED;
		break;

		default:
		if (VDBG) {
		log("DcInactiveState nothandled msg.what=0x" +
		@@ -831,13 +839,6 @@ public abstract class DataConnection extends StateMachine {
		ConnectionParams cp;

		switch (msg.what) {
		case EVENT_DISCONNECT:
		if (DBG) log("DcActivatingState deferring msg.what=EVENT_DISCONNECT"
		+ mRefCount);
		deferMessage(msg);
		retVal = HANDLED;
		break;

		case EVENT_CONNECT:
		if (DBG) log("DcActivatingState deferring msg.what=EVENT_CONNECT refCount = "
		+ mRefCount);