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

Commit 2e9443c0 authored by Susheel Nyamala's avatar Susheel Nyamala Committed by Susheel nyamala
Browse files

Add iccid support for mvno data 

To support multimode cards, add iccid as a type for mvno data.

Change-Id: I51115da1b39b839aaccd12d3efe71c1c3f1322b2
parent d1be8d62

src/java/com/android/internal/telephony/dataconnection/ApnSetting.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony.dataconnection; 




import android.telephony.ServiceState;

import android.telephony.ServiceState;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;





import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.RILConstants;
@@ -34,6 +35,7 @@ public class ApnSetting { 




    static final String V2_FORMAT_REGEX = "^\\[ApnSettingV2\\]\\s*";

    static final String V2_FORMAT_REGEX = "^\\[ApnSettingV2\\]\\s*";

    static final String V3_FORMAT_REGEX = "^\\[ApnSettingV3\\]\\s*";

    static final String V3_FORMAT_REGEX = "^\\[ApnSettingV3\\]\\s*";

    static final String TAG = "ApnSetting";





    public final String carrier;

    public final String carrier;

    public final String apn;

    public final String apn;
@@ -368,7 +370,20 @@ public class ApnSetting { 
                    gid1.substring(0, mvno_match_data_length).equalsIgnoreCase(mvnoMatchData)) {

                    gid1.substring(0, mvno_match_data_length).equalsIgnoreCase(mvnoMatchData)) {

                return true;

                return true;

            }

            }

        } else if (mvnoType.equalsIgnoreCase("iccid")) {

            String iccId = r.getIccId();

            if (iccId != null) {

                String[] mvnoIccidList = mvnoMatchData.split(",");

                for (String mvnoIccid : mvnoIccidList) {

                    Log.d(TAG, "mvnoIccid: " + mvnoIccid);

                    if (iccId.startsWith(mvnoIccid)) {

                        Log.d(TAG, "mvno icc id match found");

                        return true;

                    }

                }

            }

            }

        }



        return false;

        return false;

    }

    }