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

Commit 173c861a authored by Josh Hou's avatar Josh Hou Committed by Android (Google) Code Review
Browse files

Merge "To clean mIsInEmergencyCall after ECC srvcc completed." into qt-dev

parents 51f7b95a 353347be

src/java/com/android/internal/telephony/Phone.java

+2 −0
Original line number Diff line number Diff line
@@ -983,6 +983,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        migrate(mUnknownConnectionRegistrants, from.mUnknownConnectionRegistrants);

        migrate(mSuppServiceFailedRegistrants, from.mSuppServiceFailedRegistrants);

        migrate(mCellInfoRegistrants, from.mCellInfoRegistrants);

        // The emergency state of IMS phone will be cleared in ImsPhone#notifySrvccState after

        // receive SRVCC completed

        if (from.isInEmergencyCall()) {

            setIsInEmergencyCall();

        }

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+5 −0
Original line number Diff line number Diff line
@@ -3217,12 +3217,17 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        mSrvccState = state;



        if (mSrvccState == Call.SrvccState.COMPLETED) {

            resetState();

            transferHandoverConnections(mForegroundCall);

            transferHandoverConnections(mBackgroundCall);

            transferHandoverConnections(mRingingCall);

        }

    }



    private void resetState() {

        mIsInEmergencyCall = false;

    }



    //****** Overridden from Handler



    @Override