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

Commit 94586cdd authored by Nancy Chen's avatar Nancy Chen Committed by Android (Google) Code Review
Browse files

Merge "Enable account selection for MMI codes that involve "dialing"." into lmp-sprout-dev

parents eae93b4c 8d92f456

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

+5 −2
Original line number Diff line number Diff line
@@ -436,7 +436,10 @@ public final class CallsManager extends Call.ListenerBase { 
            return null;

        }



        if (phoneAccountHandle == null && accounts.size() > 1 && !isEmergencyCall) {

        boolean needsAccountSelection = phoneAccountHandle == null && accounts.size() > 1 &&

                !isEmergencyCall;



        if (needsAccountSelection) {

            // This is the state where the user is expected to select an account

            call.setState(CallState.PRE_DIAL_WAIT);

            extras.putParcelableList(android.telecom.Call.AVAILABLE_PHONE_ACCOUNTS, accounts);
@@ -447,7 +450,7 @@ public final class CallsManager extends Call.ListenerBase { 
        call.setExtras(extras);



        // Do not add the call if it is a potential MMI code.

        if (isPotentialMMICode(handle) || isPotentialInCallMMICode) {

        if ((isPotentialMMICode(handle) || isPotentialInCallMMICode) && !needsAccountSelection) {

            call.addListener(this);

        } else {

            addCall(call);