Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f545d69 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix handling of connect req while connected. 

Without this our generation number gets out of sync and
we ignore disconnection results.

bug:24462721
Change-Id: I348c70c4368c4d4d9ad466e4a6803f935bb43bc1
parent a6baea1c

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;