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

Commit 837491ca authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Provide default value for operator numeric for CDMA."

parents dd1729b9 fe629782

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ public class CDMAPhone extends PhoneBase { 


    Registrant mPostDialHandler;



    static String PROPERTY_CDMA_HOME_OPERATOR_NUMERIC = "ro.cdma.home.operator.numeric";



    // Constructors

    public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier) {
@@ -196,7 +197,7 @@ public class CDMAPhone extends PhoneBase { 
        setSystemProperty(PROPERTY_ICC_OPERATOR_ALPHA, operatorAlpha);



        // Sets operator numeric property by retrieving from build-time system property

        String operatorNumeric = SystemProperties.get("ro.cdma.home.operator.numeric");

        String operatorNumeric = SystemProperties.get(PROPERTY_CDMA_HOME_OPERATOR_NUMERIC);

        setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, operatorNumeric);



        // Sets iso country property by retrieving from build-time system property

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.telephony.cdma;



import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC;



import com.android.internal.telephony.CommandException;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.DataConnectionTracker;
@@ -794,6 +796,18 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
                String opNames[] = (String[])ar.result;



                if (opNames != null && opNames.length >= 3) {

                    // If the NUMERIC field isn't valid use PROPERTY_CDMA_HOME_OPERATOR_NUMERIC

                    if ((opNames[2] == null) || (opNames[2].length() < 5)

                            || ("00000".equals(opNames[2]))) {

                        opNames[2] = SystemProperties.get(

                                CDMAPhone.PROPERTY_CDMA_HOME_OPERATOR_NUMERIC, "00000");

                        if (DBG) {

                            log("RIL_REQUEST_OPERATOR.response[2], the numeric, " +

                                    " is bad. Using SystemProperties '" +

                                            CDMAPhone.PROPERTY_CDMA_HOME_OPERATOR_NUMERIC +

                                    "'= " + opNames[2]);

                        }

                    }

                    if (cm.getRadioState().isNVReady()) {

                        // In CDMA in case on NV, the ss.mOperatorAlphaLong is set later with the

                        // ERI text, so here it is ignored what is coming from the modem.