am 0613e459: Merge "Fix handling of connect req while connected." into mnc-dr-dev (196ae4d4) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1848,17 +1848,11 @@ public final class DataConnection extends StateMachine {
	switch (msg.what) {		switch (msg.what) {
	case EVENT_CONNECT: {		case EVENT_CONNECT: {
	ConnectionParams cp = (ConnectionParams) msg.obj;		ConnectionParams cp = (ConnectionParams) msg.obj;
	if (DBG) {		// either add this new apn context to our set or
	log("DcActiveState: EVENT_CONNECT cp=" + cp + " dc=" + DataConnection.this);		// update the existing cp with the latest connection generation number
	}
	if (mApnContexts.containsKey(cp.mApnContext)) {
	log("DcActiveState ERROR already added apnContext=" + cp.mApnContext);
	} else {
	mApnContexts.put(cp.mApnContext, cp);		mApnContexts.put(cp.mApnContext, cp);
	if (DBG) {		if (DBG) {
	log("DcActiveState msg.what=EVENT_CONNECT RefCount="		log("DcActiveState: EVENT_CONNECT cp=" + cp + " dc=" + DataConnection.this);
	+ mApnContexts.size());
	}
	}		}
	notifyConnectCompleted(cp, DcFailCause.NONE, false);		notifyConnectCompleted(cp, DcFailCause.NONE, false);
	retVal = HANDLED;		retVal = HANDLED;