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

Commit bfba5536 authored by Josh Hou's avatar Josh Hou Committed by android-build-merger
Browse files

Merge "To clean mIsInEmergencyCall after ECC srvcc completed." into qt-dev am: 173c861a 

am: 569fcaaa

Change-Id: Ib894ebe82c50735b19c73461c283397e41ea1df3
parents 8430d5ee 569fcaaa

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

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

        migrate(mUnknownConnectionRegistrants, from.mUnknownConnectionRegistrants);

        migrate(mSuppServiceFailedRegistrants, from.mSuppServiceFailedRegistrants);

        migrate(mSuppServiceFailedRegistrants, from.mSuppServiceFailedRegistrants);

        migrate(mCellInfoRegistrants, from.mCellInfoRegistrants);

        migrate(mCellInfoRegistrants, from.mCellInfoRegistrants);

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

        // receive SRVCC completed

        if (from.isInEmergencyCall()) {

        if (from.isInEmergencyCall()) {

            setIsInEmergencyCall();

            setIsInEmergencyCall();

        }

        }

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

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

        mSrvccState = state;





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

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

            resetState();

            transferHandoverConnections(mForegroundCall);

            transferHandoverConnections(mForegroundCall);

            transferHandoverConnections(mBackgroundCall);

            transferHandoverConnections(mBackgroundCall);

            transferHandoverConnections(mRingingCall);

            transferHandoverConnections(mRingingCall);

        }

        }

    }

    }





    private void resetState() {

        mIsInEmergencyCall = false;

    }



    //****** Overridden from Handler

    //****** Overridden from Handler





    @Override

    @Override