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

Commit 3516de95 authored by Naveen Kalla's avatar Naveen Kalla
Browse files

Convert CDMA caller ID codes while roaming on 3GPP networks 

Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Manually tested the following scenarios
      1) Device is not roaming on UMTS/IMS. Dialed String was not converted
      2) Device was roaming on UMTS/IMS and Carrier Config was not set. Dial
         String was not converted.
      3) Device was roaming on UMTS/IMS and Carrier Config was set to true.
         Dial String with *67 and *82 were converted to their 3GPP
         equivalent MMI coded dial strings.

Change-Id: I411cbfea77f0a42a76827b372c2b08fb05975548
Merged-In: I411cbfea77f0a42a76827b372c2b08fb05975548
parent d430a58a

src/java/com/android/internal/telephony/MmiCode.java

+16 −4
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.internal.telephony; 


import android.os.ResultReceiver;



import java.util.regex.Pattern;



/**

 * {@hide}

 */
@@ -33,7 +35,6 @@ public interface MmiCode 
        FAILED

    }





    /**

     * @return Current state of MmiCode request

     */
@@ -86,4 +87,15 @@ public interface MmiCode 
     * @return the dialString.

     */

    public String getDialString();



    Pattern sPatternCdmaMmiCodeWhileRoaming = Pattern.compile(

            "\\*(\\d{2})(\\+{0,1})(\\d{0,})");

    /*           1        2         3

           1 = service code

           2 = prefix

           3 = number

    */

    int MATCH_GROUP_CDMA_MMI_CODE_SERVICE_CODE = 1;

    int MATCH_GROUP_CDMA_MMI_CODE_NUMBER_PREFIX = 2;

    int MATCH_GROUP_CDMA_MMI_CODE_NUMBER = 3;

}

src/java/com/android/internal/telephony/Phone.java

+26 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.PersistableBundle;

import android.os.Registrant;

import android.os.RegistrantList;

import android.os.SystemProperties;
@@ -40,6 +41,7 @@ import android.preference.PreferenceManager; 
import android.provider.Settings;

import android.service.carrier.CarrierIdentifier;

import android.telecom.VideoProfile;

import android.telephony.CarrierConfigManager;

import android.telephony.CellIdentityCdma;

import android.telephony.CellInfo;

import android.telephony.CellInfoCdma;
@@ -574,6 +576,30 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        }

    }



    /**

     * Checks if device should convert CDMA Caller ID restriction related MMI codes to

     * equivalent 3GPP MMI Codes that provide same functionality when device is roaming.

     * This method should only return true on multi-mode devices when carrier requires this

     * conversion to be done on the device.

     *

     * @return true when carrier config

     * "KEY_CONVERT_CDMA_CALLER_ID_MMI_CODES_WHILE_ROAMING_ON_3GPP_BOOL" is set to true

     */

    public boolean supportsConversionOfCdmaCallerIdMmiCodesWhileRoaming() {

        CarrierConfigManager configManager = (CarrierConfigManager)

                getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle b = configManager.getConfig();

        if (b != null) {

            return b.getBoolean(

                    CarrierConfigManager

                            .KEY_CONVERT_CDMA_CALLER_ID_MMI_CODES_WHILE_ROAMING_ON_3GPP_BOOL,

                    false);

        } else {

            // Default value set in CarrierConfigManager

            return false;

        }

    }



    /**

     * When overridden the derived class needs to call

     * super.handleMessage(msg) so this method has a

src/java/com/android/internal/telephony/gsm/GsmMmiCode.java

+56 −10
Original line number Diff line number Diff line
@@ -16,25 +16,44 @@ 


package com.android.internal.telephony.gsm;



import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_ASYNC;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_SYNC;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_FAX;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_MAX;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_NONE;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PACKET;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PAD;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_SMS;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;



import android.content.Context;

import android.content.res.Resources;

import com.android.internal.telephony.*;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.UiccCardApplication;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;



import android.os.*;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.Message;

import android.os.ResultReceiver;

import android.telephony.PhoneNumberUtils;

import android.text.SpannableStringBuilder;

import android.telephony.Rlog;

import android.text.BidiFormatter;

import android.text.SpannableStringBuilder;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;

import android.telephony.Rlog;



import static com.android.internal.telephony.CommandsInterface.*;

import com.android.internal.telephony.CallForwardInfo;

import com.android.internal.telephony.CallStateException;

import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.GsmCdmaPhone;

import com.android.internal.telephony.MmiCode;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.UiccCardApplication;



import java.util.regex.Pattern;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



/**

 * The motto for this file is:
@@ -193,6 +212,14 @@ public final class GsmMmiCode extends Handler implements MmiCode { 
        Matcher m;

        GsmMmiCode ret = null;



        if (phone.getServiceState().getVoiceRoaming()

                && phone.supportsConversionOfCdmaCallerIdMmiCodesWhileRoaming()) {

            /* The CDMA MMI coded dialString will be converted to a 3GPP MMI Coded dialString

               so that it can be processed by the matcher and code below

             */

            dialString = convertCdmaMmiCodesTo3gppMmiCodes(dialString);

        }



        m = sPatternSuppService.matcher(dialString);



        // Is this formatted like a standard supplementary service code?
@@ -237,6 +264,25 @@ public final class GsmMmiCode extends Handler implements MmiCode { 
        return ret;

    }



    private static String convertCdmaMmiCodesTo3gppMmiCodes(String dialString) {

        Matcher m;

        m = sPatternCdmaMmiCodeWhileRoaming.matcher(dialString);

        if (m.matches()) {

            String serviceCode = makeEmptyNull(m.group(MATCH_GROUP_CDMA_MMI_CODE_SERVICE_CODE));

            String prefix = m.group(MATCH_GROUP_CDMA_MMI_CODE_NUMBER_PREFIX);

            String number = makeEmptyNull(m.group(MATCH_GROUP_CDMA_MMI_CODE_NUMBER));



            if (serviceCode.equals("67") && number != null) {

                // "#31#number" to invoke CLIR

                dialString = ACTION_DEACTIVATE + SC_CLIR + ACTION_DEACTIVATE + prefix + number;

            } else if (serviceCode.equals("82") && number != null) {

                // "*31#number" to suppress CLIR

                dialString = ACTION_ACTIVATE + SC_CLIR + ACTION_DEACTIVATE + prefix + number;

            }

        }

        return dialString;

    }



    public static GsmMmiCode

    newNetworkInitiatedUssd(String ussdMessage,

                            boolean isUssdRequest, GsmCdmaPhone phone, UiccCardApplication app) {

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

+42 −17
Original line number Diff line number Diff line
@@ -16,6 +16,17 @@ 


package com.android.internal.telephony.imsphone;



import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_ASYNC;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_SYNC;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_FAX;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_MAX;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_NONE;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PACKET;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PAD;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_SMS;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;



import android.content.Context;

import android.content.res.Resources;

import android.os.AsyncResult;
@@ -24,36 +35,23 @@ import android.os.Handler; 
import android.os.Message;

import android.os.ResultReceiver;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;

import android.text.SpannableStringBuilder;

import android.text.TextUtils;

import android.telephony.Rlog;



import com.android.ims.ImsException;

import com.android.ims.ImsReasonInfo;

import com.android.ims.ImsSsInfo;

import com.android.ims.ImsUtInterface;

import com.android.internal.telephony.CallForwardInfo;

import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CallStateException;

import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.uicc.IccRecords;



import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_NONE;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_FAX;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_SMS;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_SYNC;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_ASYNC;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PACKET;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PAD;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_MAX;



import com.android.internal.telephony.MmiCode;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.uicc.IccRecords;



import java.util.regex.Pattern;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



/**

 * The motto for this file is:
@@ -245,6 +243,14 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
        Matcher m;

        ImsPhoneMmiCode ret = null;



        if (phone.getDefaultPhone().getServiceState().getVoiceRoaming()

                && phone.getDefaultPhone().supportsConversionOfCdmaCallerIdMmiCodesWhileRoaming()) {

            /* The CDMA MMI coded dialString will be converted to a 3GPP MMI Coded dialString

               so that it can be processed by the matcher and code below

             */

            dialString = convertCdmaMmiCodesTo3gppMmiCodes(dialString);

        }



        m = sPatternSuppService.matcher(dialString);



        // Is this formatted like a standard supplementary service code?
@@ -289,6 +295,25 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
        return ret;

    }



    private static String convertCdmaMmiCodesTo3gppMmiCodes(String dialString) {

        Matcher m;

        m = sPatternCdmaMmiCodeWhileRoaming.matcher(dialString);

        if (m.matches()) {

            String serviceCode = makeEmptyNull(m.group(MATCH_GROUP_CDMA_MMI_CODE_SERVICE_CODE));

            String prefix = m.group(MATCH_GROUP_CDMA_MMI_CODE_NUMBER_PREFIX);

            String number = makeEmptyNull(m.group(MATCH_GROUP_CDMA_MMI_CODE_NUMBER));



            if (serviceCode.equals("67") && number != null) {

                // "#31#number" to invoke CLIR

                dialString = ACTION_DEACTIVATE + SC_CLIR + ACTION_DEACTIVATE + prefix + number;

            } else if (serviceCode.equals("82") && number != null) {

                // "*31#number" to suppress CLIR

                dialString = ACTION_ACTIVATE + SC_CLIR + ACTION_DEACTIVATE + prefix + number;

            }

        }

        return dialString;

    }



    static ImsPhoneMmiCode

    newNetworkInitiatedUssd(String ussdMessage, boolean isUssdRequest, ImsPhone phone) {

        ImsPhoneMmiCode ret;