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

Commit 5dafa9c8 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7069213 from 16f38bda to rvc-qpr3-release 

Change-Id: I033c3c619fa21ce6200358c361a06cf9457e7464
parents 8119a319 16f38bda

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

+5 −2
Original line number Diff line number Diff line
@@ -299,7 +299,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;
@@ -958,6 +958,7 @@ public class DataConnection extends StateMachine { 
        mUnmeteredOverride = false;

        mDownlinkBandwidth = 14;

        mUplinkBandwidth = 14;

        mHandoverState = HANDOVER_STATE_IDLE;

    }



    /**
@@ -2275,7 +2276,9 @@ public class DataConnection extends StateMachine { 
            // data connection is disconnected. If we don't own this agent at this point, that means

            // it has been transferred to the new data connection for IWLAN data handover case.

            if (mNetworkAgent != null) {

                mNetworkAgent.sendNetworkInfo(mNetworkInfo, DataConnection.this);

                if (mHandoverState == HANDOVER_STATE_IDLE) {

                    mNetworkAgent.unregister(DataConnection.this);

                }

                mNetworkAgent.releaseOwnership(DataConnection.this);

            }

            mNetworkAgent = null;