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

Commit 333581d5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of atel.lnx.2.0-00011. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1049393   I389b31b766bc6a21e5ab0afabaf14307c7367d72   Fix to create network agent.

Change-Id: I9cfb5d3797c9f6d9b4d8a6a9cf2174175e29fba5
CRs-Fixed: 1049393
parents 253381f9 232c11a5

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

+10 −4
Original line number Diff line number Diff line
@@ -1480,6 +1480,10 @@ public class DataConnection extends StateMachine { 
    }

    private DcActivatingState mActivatingState = new DcActivatingState();



    public final boolean hasMessages(int what, Object object) {

        return DataConnection.this.getHandler().hasMessages(what, object);

    }



    /**

     * The state machine is connected, expecting an EVENT_DISCONNECT.

     */
@@ -1489,10 +1493,12 @@ public class DataConnection extends StateMachine { 


            boolean createNetworkAgent = true;

            // If a disconnect is already pending, avoid notifying all of connected

            if (hasMessages(EVENT_DISCONNECT) ||

                    hasMessages(EVENT_DISCONNECT_ALL) ||

                    hasDeferredMessages(EVENT_DISCONNECT) ||

                    hasDeferredMessages(EVENT_DISCONNECT_ALL)) {

            if (hasMessages(EVENT_DISCONNECT, mConnectionParams.mOnCompletedMsg.obj) ||

                    hasMessages(EVENT_DISCONNECT_ALL, mConnectionParams.

                    mOnCompletedMsg.obj) || hasDeferredMessages(EVENT_DISCONNECT,

                    mConnectionParams.mOnCompletedMsg.obj) ||

                    hasDeferredMessages(EVENT_DISCONNECT_ALL, mConnectionParams.

                    mOnCompletedMsg.obj)) {

                log("DcActiveState: skipping notifyAllOfConnected()");

                createNetworkAgent = false;

            } else {