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

Commit 52bc363c authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android (Google) Code Review
Browse files

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

parents d16505da 45b97c2c

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

wifi/java/android/net/wifi/WifiStateMachine.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

        }