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

Commit e1374ba6 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added slot index version of getNetworkCountryIso" 

am: 646e5662

Change-Id: Ib0bd8b769d4f08b659a087648814f622138a4a90
parents 21eaad2b 646e5662

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

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ public class GsmCdmaCallTracker extends CallTracker { 
        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

        String origNumber = dialString;

        String operatorIsoContry = tm.getNetworkCountryIsoForPhone(mPhone.getPhoneId());

        String operatorIsoContry = tm.getNetworkCountryIso(mPhone.getPhoneId());

        String simIsoContry = tm.getSimCountryIsoForPhone(mPhone.getPhoneId());

        boolean internationalRoaming = !TextUtils.isEmpty(operatorIsoContry)

                && !TextUtils.isEmpty(simIsoContry)

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

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public interface NitzStateMachine { 
        @Override

        @Nullable

        public String getNetworkCountryIsoForPhone() {

            return mTelephonyManager.getNetworkCountryIsoForPhone(mPhone.getPhoneId());

            return mTelephonyManager.getNetworkCountryIso(mPhone.getPhoneId());

        }



        @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ public abstract class SMSDispatcher extends Handler { 
                if (simCountryIso == null || simCountryIso.length() != 2) {

                    Rlog.e(TAG, "Can't get SIM country Iso: trying network country Iso");

                    simCountryIso =

                            mTelephonyManager.getNetworkCountryIsoForPhone(mPhone.getPhoneId());

                            mTelephonyManager.getNetworkCountryIso(mPhone.getPhoneId());

                }



                smsCategory =
@@ -1251,7 +1251,7 @@ public abstract class SMSDispatcher extends Handler { 
            }

            if (rule == PREMIUM_RULE_USE_NETWORK || rule == PREMIUM_RULE_USE_BOTH) {

                String networkCountryIso =

                        mTelephonyManager.getNetworkCountryIsoForPhone(mPhone.getPhoneId());

                        mTelephonyManager.getNetworkCountryIso(mPhone.getPhoneId());

                if (networkCountryIso == null || networkCountryIso.length() != 2) {

                    Rlog.e(TAG, "Can't get Network country Iso: trying SIM country Iso");

                    networkCountryIso =