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

Commit 2767926b authored by Sailesh Nepal's avatar Sailesh Nepal
Browse files

Fix fallback for emergency calls 

When the first call service disconnects the
disconnect state causes the in-call UI to close.
This means that falling back to the call assistant
for emergency calls didn't work.

Fix was to not set the disconnect state until fallback
was completed.

Bug: 18593307
Change-Id: Ifd0a83662b3edd9b7f324a3eb0b8d519cab44513
parent 07bc5ee8

src/com/android/server/telecom/Call.java

+12 −9
Original line number Diff line number Diff line
@@ -385,7 +385,18 @@ final class Call implements CreateConnectionResponse { 
    void setState(int newState) {

        if (mState != newState) {

            Log.v(this, "setState %s -> %s", mState, newState);

            int oldState = mState;



            if (newState == CallState.DISCONNECTED

                    && (mState == CallState.DIALING || mState == CallState.CONNECTING)

                    && mCreateConnectionProcessor != null

                    && mCreateConnectionProcessor.isProcessingComplete()

                    && mCreateConnectionProcessor.hasMorePhoneAccounts()

                    && mDisconnectCause != null

                    && mDisconnectCause.getCode() == DisconnectCause.ERROR) {

                mCreateConnectionProcessor.continueProcessingIfPossible(this, mDisconnectCause);

                return;

            }



            mState = newState;

            maybeLoadCannedSmsResponses();
@@ -403,14 +414,6 @@ final class Call implements CreateConnectionResponse { 
                mDisconnectTimeMillis = System.currentTimeMillis();

                setLocallyDisconnecting(false);

                fixParentAfterDisconnect();

                if ((oldState == CallState.DIALING || oldState == CallState.CONNECTING)

                        && mCreateConnectionProcessor != null

                        && mCreateConnectionProcessor.isProcessingComplete()

                        && mCreateConnectionProcessor.hasMorePhoneAccounts()

                        && mDisconnectCause != null

                        && mDisconnectCause.getCode() == DisconnectCause.ERROR) {

                    mCreateConnectionProcessor.continueProcessingIfPossible(this, mDisconnectCause);

                }

            }

        }

    }