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

Commit e469d19a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove setIsoCountryProperty method along with partially dead code" am:... 

Merge "Remove setIsoCountryProperty method along with partially dead code" am: 83c97036 am: 0ef4ed9a am: c32582c2 am: 2438f2cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1333254

Change-Id: Ibad76209dd3ff94cd37cb2762b9cafebbb8b8393
parents 80285144 2438f2cd

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+12 −26
Original line number Diff line number Diff line
@@ -444,40 +444,26 @@ public class GsmCdmaPhone extends Phone { 
                tm.setSimOperatorNumericForPhone(mPhoneId, operatorNumeric);



                SubscriptionController.getInstance().setMccMnc(operatorNumeric, getSubId());

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

                setIsoCountryProperty(operatorNumeric);

                // Updates MCC MNC device configuration information

                logd("update mccmnc=" + operatorNumeric);

                MccTable.updateMccMncConfiguration(mContext, operatorNumeric);

            }



            // Sets current entry in the telephony carrier table

            updateCurrentCarrierInProvider(operatorNumeric);

        }

    }



    //CDMA

    /**

     * Sets PROPERTY_ICC_OPERATOR_ISO_COUNTRY property

     *

     */

    private void setIsoCountryProperty(String operatorNumeric) {

        TelephonyManager tm = TelephonyManager.from(mContext);

        if (TextUtils.isEmpty(operatorNumeric)) {

            logd("setIsoCountryProperty: clear 'gsm.sim.operator.iso-country'");

            tm.setSimCountryIsoForPhone(mPhoneId, "");

            SubscriptionController.getInstance().setCountryIso("", getSubId());

        } else {

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

                String iso = "";

                try {

                    iso = MccTable.countryCodeForMcc(operatorNumeric.substring(0, 3));

                } catch (StringIndexOutOfBoundsException ex) {

                Rlog.e(LOG_TAG, "setIsoCountryProperty: countryCodeForMcc error", ex);

                    Rlog.e(LOG_TAG, "init: countryCodeForMcc error", ex);

                }



            logd("setIsoCountryProperty: set 'gsm.sim.operator.iso-country' to iso=" + iso);

                logd("init: set 'gsm.sim.operator.iso-country' to iso=" + iso);

                tm.setSimCountryIsoForPhone(mPhoneId, iso);

                SubscriptionController.getInstance().setCountryIso(iso, getSubId());



                // Updates MCC MNC device configuration information

                logd("update mccmnc=" + operatorNumeric);

                MccTable.updateMccMncConfiguration(mContext, operatorNumeric);

            }



            // Sets current entry in the telephony carrier table

            updateCurrentCarrierInProvider(operatorNumeric);

        }

    }