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

Commit 45c48a21 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix abnormal state of mHoldSwitchingState in ImsPhoneCallTracker"

parents 96860aaa beff722e

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

+3 −0
Original line number Diff line number Diff line
@@ -1675,6 +1675,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            ImsCall callToHold = mForegroundCall.getImsCall();

            HoldSwapState oldHoldState = mHoldSwitchingState;

            mHoldSwitchingState = HoldSwapState.HOLDING_TO_ANSWER_INCOMING;

            ImsCall callExpectedToResume = mCallExpectedToResume;

            mCallExpectedToResume = mRingingCall.getImsCall();

            mForegroundCall.switchWith(mBackgroundCall);

            logHoldSwapState("holdActiveCallForWaitingCall");

            try {
@@ -1684,6 +1686,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            } catch (ImsException e) {

                mForegroundCall.switchWith(mBackgroundCall);

                mHoldSwitchingState = oldHoldState;

                mCallExpectedToResume = callExpectedToResume;

                logHoldSwapState("holdActiveCallForWaitingCall - fail");

                throw new CallStateException(e.getMessage());

            }