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

Commit 5b452df4 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Allow sending of in-call MMI codes through to telephony. 

1. Fixing bug where having multiple calls in progress it would not be
possible to send the ECT MMI code due to code that checks for the number
of current calls.
2. Fixed issue where InCall MMI codes would be dialed as a regular call,
showing the InCall UI.  In KitKat, dialing an incall MMI code would
bypass the InCall UI, dialing the MMI code directly.

Bug: 17700763
Change-Id: I41b9b329609e100540c4d60e1243dc08354bb481
parent 802363d9

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

+34 −4
Original line number Diff line number Diff line
@@ -25,8 +25,10 @@ import android.telecom.CallState; 
import android.telecom.DisconnectCause;

import android.telecom.GatewayInfo;

import android.telecom.ParcelableConference;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telecom.PhoneCapabilities;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;



import com.android.internal.util.IndentingPrintWriter;
@@ -383,10 +385,11 @@ public final class CallsManager extends Call.ListenerBase { 


        boolean isEmergencyCall = TelephonyUtil.shouldProcessAsEmergency(mContext,

                call.getHandle());

        boolean isPotentialInCallMMICode = isPotentialInCallMMICode(handle);



        // Do not support any more live calls.  Our options are to move a call to hold, disconnect

        // a call, or cancel this call altogether.

        if (!makeRoomForOutgoingCall(call, isEmergencyCall)) {

        if (!isPotentialInCallMMICode && !makeRoomForOutgoingCall(call, isEmergencyCall)) {

            // just cancel at this point.

            return null;

        }
@@ -401,10 +404,10 @@ public final class CallsManager extends Call.ListenerBase { 


        call.setExtras(extras);



        if (!isPotentialMMICode(handle)) {

            addCall(call);

        } else {

        if (isPotentialMMICode(handle) || isPotentialInCallMMICode) {

            call.addListener(this);

        } else {

            addCall(call);

        }



        return call;
@@ -1029,6 +1032,33 @@ public final class CallsManager extends Call.ListenerBase { 
                && handle.getSchemeSpecificPart().contains("#"));

    }



    /**

     * Determines if a dialed number is potentially an In-Call MMI code.  In-Call MMI codes are

     * MMI codes which can be dialed when one or more calls are in progress.

     * <P>

     * Checks for numbers formatted similar to the MMI codes defined in:

     * {@link com.android.internal.telephony.gsm.GSMPhone#handleInCallMmiCommands(String)}

     * and

     * {@link com.android.internal.telephony.imsphone.ImsPhone#handleInCallMmiCommands(String)}

     *

     * @param handle The URI to call.

     * @return {@code True} if the URI represents a number which could be an in-call MMI code.

     */

    private boolean isPotentialInCallMMICode(Uri handle) {

        if (handle != null && handle.getSchemeSpecificPart() != null &&

                handle.getScheme().equals(PhoneAccount.SCHEME_TEL)) {



            String dialedNumber = handle.getSchemeSpecificPart();

            return (dialedNumber.equals("0") ||

                    (dialedNumber.startsWith("1") && dialedNumber.length() <= 2) ||

                    (dialedNumber.startsWith("2") && dialedNumber.length() <= 2) ||

                    dialedNumber.equals("3") ||

                    dialedNumber.equals("4") ||

                    dialedNumber.equals("5"));

        }

        return false;

    }



    private int getNumCallsWithState(int... states) {

        int count = 0;

        for (int state : states) {