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

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

Merge "Add some additional debug for set operator numeric."

parents 425c726a 431a4a3b

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

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ public class CDMAPhone extends PhoneBase { 


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

        String operatorNumeric = SystemProperties.get(PROPERTY_CDMA_HOME_OPERATOR_NUMERIC);

        log("CDMAPhone: init set 'gsm.sim.operator.numeric' to operator='" +

                operatorNumeric + "'");

        setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, operatorNumeric);



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

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

+2 −2
Original line number Diff line number Diff line
@@ -329,11 +329,11 @@ public final class RuimRecords extends IccRecords { 


    @Override

    protected void onAllRecordsLoaded() {

        log("RuimRecords: record load complete");



        // Further records that can be inserted are Operator/OEM dependent



        String operator = getRUIMOperatorNumeric();

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

                operator + "'");

        SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, operator);



        if (mImsi != null) {

telephony/java/com/android/internal/telephony/gsm/SIMRecords.java

+3 −2
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ public class SIMRecords extends IccRecords { 


        adnCache.reset();



        log("SIMRecords: onRadioOffOrNotAvailable set 'gsm.sim.operator.numeric' to operator=null");

        SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, null);

        SystemProperties.set(PROPERTY_ICC_OPERATOR_ALPHA, null);

        SystemProperties.set(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, null);
@@ -1254,12 +1255,12 @@ public class SIMRecords extends IccRecords { 
    }



    protected void onAllRecordsLoaded() {

        log("record load complete");



        String operator = getOperatorNumeric();



        // Some fields require more than one SIM record to set



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

                operator + "'");

        SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, operator);



        if (imsi != null) {