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

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

+3 −9

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