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

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

Merge "Set mGotCountryCode properly."

parents 16721242 b166bc81

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

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 


            if (operatorNumeric == null) {

                phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");

                mGotCountryCode = false;

            } else {

                String isoCountryCode = "";

                try {

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

+1 −0
Original line number Diff line number Diff line
@@ -964,6 +964,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 


            if (operatorNumeric == null) {

                phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");

                mGotCountryCode = false;

            } else {

                String isoCountryCode = "";

                try{

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

+1 −0
Original line number Diff line number Diff line
@@ -846,6 +846,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 


            if (operatorNumeric == null) {

                phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, "");

                mGotCountryCode = false;

            } else {

                String iso = "";

                try{