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

Commit 353347be authored by SongFerngWang's avatar SongFerngWang Committed by Josh Hou
Browse files

To clean mIsInEmergencyCall after ECC srvcc completed. 

ECC do handover. ImsPhoneCallTracker don't clean mIsInEmergencyCall
after srvcc completed.

Bug: 132323094
Test: build pass
Change-Id: Iac5b1f07d8ec15b0d1f7c7576adcc05ab1e67bef
parent 5a38b677

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