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

Commit 2463a147 authored by Xia Ying's avatar Xia Ying Committed by Amit Mahajan
Browse files

Add gid to configure no_ems_support_sim_operators 

Since several carriers used same mccmnc, we need to
add gid to distinguish them.

Change-Id: Ic0af3f19c9621fa22a7ecb7c1508962cf6a8867b
parent 121eaf87

src/java/android/telephony/SmsMessage.java

+15 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.telephony; 
import android.os.Parcel;

import android.telephony.Rlog;

import android.content.res.Resources;

import android.text.TextUtils;



import com.android.internal.telephony.GsmAlphabet;

import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
@@ -763,8 +764,13 @@ public class SmsMessage { 
        }



        String simOperator = TelephonyManager.getDefault().getSimOperator();

        String gid = TelephonyManager.getDefault().getGroupIdLevel1();



        for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) {

            if (simOperator.startsWith(currentConfig.mOperatorNumber)) {

            if (simOperator.startsWith(currentConfig.mOperatorNumber) &&

                (TextUtils.isEmpty(currentConfig.mGid1) ||

                (!TextUtils.isEmpty(currentConfig.mGid1)

                && currentConfig.mGid1.equalsIgnoreCase(gid)))) {

                return false;

            }

         }
@@ -781,8 +787,12 @@ public class SmsMessage { 
        }



        String simOperator = TelephonyManager.getDefault().getSimOperator();

        String gid = TelephonyManager.getDefault().getGroupIdLevel1();

        for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) {

            if (simOperator.startsWith(currentConfig.mOperatorNumber)) {

            if (simOperator.startsWith(currentConfig.mOperatorNumber) &&

                (TextUtils.isEmpty(currentConfig.mGid1) ||

                (!TextUtils.isEmpty(currentConfig.mGid1)

                && currentConfig.mGid1.equalsIgnoreCase(gid)))) {

                return currentConfig.mIsPrefix;

            }

        }
@@ -791,17 +801,19 @@ public class SmsMessage { 


    private static class NoEmsSupportConfig {

        String mOperatorNumber;

        String mGid1;

        boolean mIsPrefix;



        public NoEmsSupportConfig(String[] config) {

            mOperatorNumber = config[0];

            mIsPrefix = "prefix".equals(config[1]);

            mGid1 = config.length > 2 ? config[2] : null;

        }



        @Override

        public String toString() {

            return "NoEmsSupportConfig { mOperatorNumber = " + mOperatorNumber

                    + ", mIsPrefix = " + mIsPrefix + " }";

                    + ", mIsPrefix = " + mIsPrefix + ", mGid1 = " + mGid1 + " }";

        }

    }