summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiCountryCode.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiCountryCode.java b/service/java/com/android/server/wifi/WifiCountryCode.java
index 58bf90fa0..e69fb8e1c 100644
--- a/service/java/com/android/server/wifi/WifiCountryCode.java
+++ b/service/java/com/android/server/wifi/WifiCountryCode.java
@@ -131,12 +131,13 @@ public class WifiCountryCode {
*/
public synchronized boolean setCountryCode(String countryCode) {
if (DBG) Log.d(TAG, "Receive set country code request: " + countryCode);
- // Ignore empty country code.
+ // Empty country code.
if (TextUtils.isEmpty(countryCode)) {
- if (DBG) Log.d(TAG, "Ignore empty country code");
- return false;
+ if (DBG) Log.d(TAG, "Received empty country code, reset to default country code");
+ mTelephonyCountryCode = null;
+ } else {
+ mTelephonyCountryCode = countryCode.toUpperCase();
}
- mTelephonyCountryCode = countryCode.toUpperCase();
// If wpa_supplicant is ready we set the country code now, otherwise it will be
// set once wpa_supplicant is ready.
if (mReady) {