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

Commit 97182d41 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Fixed incorrect unregister from connectivity service am: 7ba0f259 am:... 

Fixed incorrect unregister from connectivity service am: 7ba0f259 am: 2271e9f1 am: 00e20463 am: 1bc07bd9

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1438134

Change-Id: I0ac05ca616b4b40d696a31537d5d184555c6fc74
parents 62fb8822 1bc07bd9

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

+3 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public class DataConnection extends StateMachine { 
    public int mCid;



    @HandoverState

    private int mHandoverState;

    private int mHandoverState = HANDOVER_STATE_IDLE;

    private final Map<ApnContext, ConnectionParams> mApnContexts = new ConcurrentHashMap<>();

    PendingIntent mReconnectIntent = null;
@@ -998,6 +998,7 @@ public class DataConnection extends StateMachine { 
        mDownlinkBandwidth = 14;

        mUplinkBandwidth = 14;

        mIsSuspended = false;

        mHandoverState = HANDOVER_STATE_IDLE;

    }



    /**
@@ -2253,7 +2254,7 @@ public class DataConnection extends StateMachine { 
            // which is when IWLAN handover is ongoing. Instead of unregistering, the agent will

            // be transferred to the new data connection on the other transport.

            if (mNetworkAgent != null) {

                if (mHandoverState != HANDOVER_STATE_BEING_TRANSFERRED) {

                if (mHandoverState == HANDOVER_STATE_IDLE) {

                    mNetworkAgent.unregister(DataConnection.this);

                }

                mNetworkAgent.releaseOwnership(DataConnection.this);