diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2014-03-20 19:36:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 19:36:59 +0000 |
| commit | b876cae90d8e7e57a685e31cd3b347c325728823 (patch) | |
| tree | cbe93c4196ae3251ada2b69dd6d56cb482233554 /wifi/java | |
| parent | ecf3c574a8cedd3b104b41623d192d61cb039710 (diff) | |
| parent | f92b00722d84fa0caea25a3363242b6dced0635c (diff) | |
| download | frameworks_base-b876cae90d8e7e57a685e31cd3b347c325728823.zip frameworks_base-b876cae90d8e7e57a685e31cd3b347c325728823.tar.gz frameworks_base-b876cae90d8e7e57a685e31cd3b347c325728823.tar.bz2 | |
am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index cf1669c..67307d5 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1543,8 +1543,11 @@ public class WifiStateMachine extends StateMachine { // If it's empty, delay it in case it's a momentary dropout int countryCodeSequence = mCountryCodeSequence.incrementAndGet(); if (TextUtils.isEmpty(countryCode)) { + String defaultCountryCode = mContext.getResources().getString( + R.string.config_wifi_unknown_country_code); + sendMessageDelayed(CMD_SET_COUNTRY_CODE, countryCodeSequence, persist ? 1 : 0, - countryCode, COUNTRY_CODE_DELAY_MS); + defaultCountryCode, COUNTRY_CODE_DELAY_MS); } else { sendMessage(CMD_SET_COUNTRY_CODE, countryCodeSequence, persist ? 1 : 0, countryCode); } |