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

Commit aaa93f6f authored by Susheel nyamala's avatar Susheel nyamala Committed by Linux Build Service Account
Browse files

Fix apn population in cdma 

DcTracker uses getOperatorNumeric method to read
operator numeric value from sim/ruim records to query apns
from telephony db. For RuimRecords the operator numeric
method is defined as getRUIMOperatorNumeric instead of
extending abstract method getOperatorNumeric declared in
IccRecords. Rename getRUIMOperatorNumeric to getOperatorNumeric
such that DcTracker can use same method to read operator numeric
from sim/ruim records

Change-Id: I2d3ae4cdfed9cafb8f4f6f77ccbcf1410c2c4862
CRs-Fixed: 731653
parent e5dd24f3

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ public class CDMALTEPhone extends CDMAPhone { 
                curIccRecords = mIccRecords.get();

                if (curIccRecords != null && (curIccRecords instanceof RuimRecords)) {

                    RuimRecords csim = (RuimRecords) curIccRecords;

                    operatorNumeric = csim.getRUIMOperatorNumeric();

                    operatorNumeric = csim.getOperatorNumeric();

                }

            }

        }

src/java/com/android/internal/telephony/uicc/RuimRecords.java

+5 −4
Original line number Diff line number Diff line
@@ -208,7 +208,8 @@ public final class RuimRecords extends IccRecords { 
     * Returns the 5 or 6 digit MCC/MNC of the operator that

     *  provided the RUIM card. Returns null of RUIM is not yet ready

     */

    public String getRUIMOperatorNumeric() {

    @Override

    public String getOperatorNumeric() {

        if (mImsi == null) {

            return null;

        }
@@ -625,7 +626,7 @@ public final class RuimRecords extends IccRecords { 
                if (false) {

                    log("IMSI: " + mImsi.substring(0, 6) + "xxxxxxxxx");



                    String operatorNumeric = getRUIMOperatorNumeric();

                    String operatorNumeric = getOperatorNumeric();

                    if (operatorNumeric != null) {

                        if (operatorNumeric.length() <= 6) {

                            log("update mccmnc=" + operatorNumeric);
@@ -633,7 +634,7 @@ public final class RuimRecords extends IccRecords { 
                        }

                    }

                } else {

                    String operatorNumeric = getRUIMOperatorNumeric();

                    String operatorNumeric = getOperatorNumeric();

                    log("NO update mccmnc=" + operatorNumeric);

                }
@@ -748,7 +749,7 @@ public final class RuimRecords extends IccRecords { 


        // FIXME: CSIM IMSI may not contain the MNC.

        if (false) {

            String operator = getRUIMOperatorNumeric();

            String operator = getOperatorNumeric();

            if (!TextUtils.isEmpty(operator)) {

                log("onAllRecordsLoaded set 'gsm.sim.operator.numeric' to operator='" +

                        operator + "'");