Merge "Fix handling of connect req while connected." into mnc-dr-dev

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

@@ -1848,18 +1848,12 @@ public final class DataConnection extends StateMachine {
             switch (msg.what) {
                 case EVENT_CONNECT: {
                     ConnectionParams cp = (ConnectionParams) msg.obj;
+                    // 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: EVENT_CONNECT cp=" + cp + " dc=" + DataConnection.this);
                     }
-                    if (mApnContexts.containsKey(cp.mApnContext)) {
-                        log("DcActiveState ERROR already added apnContext=" + cp.mApnContext);
-                    } else {
-                        mApnContexts.put(cp.mApnContext, cp);
-                        if (DBG) {
-                            log("DcActiveState msg.what=EVENT_CONNECT RefCount="
-                                    + mApnContexts.size());
-                        }
-                    }
                     notifyConnectCompleted(cp, DcFailCause.NONE, false);
                     retVal = HANDLED;
                     break;