| commit | b166bc81acfd521608a1ab1003c5d728598d6ec1 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Oct 06 10:23:32 2011 -0700 |
| committer | Wink Saville <wink@google.com> | Thu Oct 06 10:23:32 2011 -0700 |
| tree | 6a61ef12a3559303ba1280f0cdf3207e4345e7ab | |
| parent | 11a670531febb0952224a0b819eb5350022fbe69 [diff] |
Set mGotCountryCode properly. mGotCountryCode needs to be set to false when we don't know the country code and to true only when we do. Bug: 2578334 Change-Id: I7cb21e627ae115880df5f9b2095cb4ba094ab751
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java index e92a276..57aae56 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
@@ -390,6 +390,7 @@ if (operatorNumeric == null) { phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, ""); + mGotCountryCode = false; } else { String isoCountryCode = ""; try {
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 0aed77e..8f5a2eb 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -964,6 +964,7 @@ if (operatorNumeric == null) { phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, ""); + mGotCountryCode = false; } else { String isoCountryCode = ""; try{
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index d3645fa..eea2780 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -846,6 +846,7 @@ if (operatorNumeric == null) { phone.setSystemProperty(TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, ""); + mGotCountryCode = false; } else { String iso = ""; try{