Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev

Browse Source
This commit is contained in:
Vinit Deshapnde
2014-03-20 19:26:44 +00:00
committed by Android (Google) Code Review
parent d16505da86 45b97c2c99
commit 52bc363cf3
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -352,6 +352,10 @@
<!-- Wifi driver supports batched scan -->
<bool translatable="false" name="config_wifi_batched_scan_supported">false</bool>
<!-- Wifi driver's fallback country code; WS is ISO-Alpha2 code for Samoa which
has restrictions on can be scanned; which may satisfy quite a few regulatory issues. -->
<string translatable="false" name="config_wifi_unknown_country_code">WS</string>
<!-- Flag indicating whether the we should enable the automatic brightness in Settings.
Software implementation will be used if config_hardware_auto_brightness_available is not set -->
<bool name="config_automatic_brightness_available">false</bool>

1
core/res/res/values/symbols.xml
View File

@@ -478,6 +478,7 @@
<java-symbol type="string" name="config_ntpServer" />
<java-symbol type="string" name="config_tether_apndata" />
<java-symbol type="string" name="config_useragentprofile_url" />
<java-symbol type="string" name="config_wifi_unknown_country_code" />
<java-symbol type="string" name="config_wifi_p2p_device_type" />
<java-symbol type="string" name="contentServiceSync" />
<java-symbol type="string" name="contentServiceSyncNotificationTitle" />

5
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@@ -1542,8 +1542,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);
}