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

Commit 292a1afe authored by luxiaol's avatar luxiaol Committed by Gerrit - the friendly Code Review server
Browse files

Telephony: update properties in IccCardProxy 

Update operator numeric properties PROPERTY_ICC_OPERATOR_NUMERIC,
PROPERTY_APN_SIM_OPERATOR_NUMERIC in IccCardProxy, instead of
updating them in SIMRecords and RuimRecords.

Multimode card will load multi sim records, the later will override the
property set before, so better to set properties based on active app type.
Or else in some network mode it will get wrong property.

Change-Id: Id4337de67dfcb11c3af29ff95bcf1da8fd48d98e
CRs-Fixed: 590681
parent 60e4ec0e

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

+29 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.telephony.TelephonyManager; 
import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.IccCard;

import com.android.internal.telephony.IccCardConstants;

import com.android.internal.telephony.MccTable;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.TelephonyIntents;
@@ -46,7 +47,9 @@ import com.android.internal.telephony.uicc.IccCardStatus.CardState; 
import com.android.internal.telephony.uicc.IccCardStatus.PinState;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.RuimRecords;



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

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

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

import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -252,6 +255,7 @@ public class IccCardProxy extends Handler implements IccCard { 
                setExternalState(State.READY);

                break;

            case EVENT_RECORDS_LOADED:

                updateproperty();

                broadcastIccStateChangedIntent(IccCardConstants.INTENT_VALUE_ICC_LOADED, null);

                break;

            case EVENT_IMSI_READY:
@@ -292,6 +296,7 @@ public class IccCardProxy extends Handler implements IccCard { 
                mUiccCard = newCard;

                mUiccApplication = newApp;

                mIccRecords = newRecords;

                updateproperty();

                registerUiccCardEvents();

                updateActiveRecord();

            }
@@ -300,6 +305,29 @@ public class IccCardProxy extends Handler implements IccCard { 
        }

    }



    /**

     * Multimode card will load multi sim records,  the later one will overwrite the property set

     * before, so better to set property after get EVENT_RECORDS_LOADED event, and new

     * IccRecords is available. Or else in some cards the operator numeric is updated wrongly.

     */

    protected void updateproperty(){

        if (mIccRecords == null) {

            log("updateproperty null mIccRecords");

        } else {

            String operator = mIccRecords.getOperatorNumeric();

            if (operator != null && mIccRecords.getRecordsLoaded()) {

                log("updateproperty operator =" + operator);

                String countryCode = operator.substring(0,3);

                SystemProperties.set(PROPERTY_ICC_OPERATOR_ISO_COUNTRY,

                        MccTable.countryCodeForMcc(Integer.parseInt(countryCode)));

                SystemProperties.set(PROPERTY_APN_SIM_OPERATOR_NUMERIC, operator);

                SystemProperties.set(PROPERTY_ICC_OPERATOR_NUMERIC, operator);

            } else {

                loge("updateproperty Operator name = " + operator + ", loaded = "

                        + mIccRecords.getRecordsLoaded());

            }

        }

    }

    protected void HandleDetectedState() {

        setExternalState(State.UNKNOWN);

    }

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

100755 → 100644
+0 −19
Original line number Diff line number Diff line
@@ -648,25 +648,6 @@ public final class RuimRecords extends IccRecords { 
    protected void onAllRecordsLoaded() {

        if (DBG) log("record load complete");



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



        String operator = getOperatorNumeric();

        if (!TextUtils.isEmpty(operator)) {

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

                    operator + "'");

            setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, operator);

        } else {

            log("onAllRecordsLoaded empty 'gsm.sim.operator.numeric' skipping");

        }



        if (!TextUtils.isEmpty(mImsi)) {

            log("onAllRecordsLoaded set mcc imsi=" + mImsi);

            setSystemProperty(PROPERTY_ICC_OPERATOR_ISO_COUNTRY,

                    MccTable.countryCodeForMcc(Integer.parseInt(mImsi.substring(0,3))));

        } else {

            log("onAllRecordsLoaded empty imsi skipping setting mcc");

        }



        setLocaleFromCsim();

        mRecordsLoadedRegistrants.notifyRegistrants(

            new AsyncResult(null, null, null));

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

+0 −17
Original line number Diff line number Diff line
@@ -1325,23 +1325,6 @@ public class SIMRecords extends IccRecords { 
        // Some fields require more than one SIM record to set



        String operator = getOperatorNumeric();

        if (!TextUtils.isEmpty(operator)) {

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

                    operator + "'");

            setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, operator);

            setSystemProperty(PROPERTY_APN_SIM_OPERATOR_NUMERIC, operator);

        } else {

            log("onAllRecordsLoaded empty 'gsm.sim.operator.numeric' skipping");

        }



        if (!TextUtils.isEmpty(mImsi)) {

            log("onAllRecordsLoaded set mcc imsi=" + mImsi);

            setSystemProperty(PROPERTY_ICC_OPERATOR_ISO_COUNTRY,

                    MccTable.countryCodeForMcc(Integer.parseInt(mImsi.substring(0,3))));

        } else {

            log("onAllRecordsLoaded empty imsi skipping setting mcc");

        }



        setVoiceMailByCountry(operator);

        setSpnFromConfig(operator);