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

Commit f0742bdf authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'mwd-merge-wifi-0602015' into mnc-dev 

* changes:
  keep hal based pno disabled by default
  fix annoying typo
  enable SSID whitelist
  Rename HandlerThread name in RttManager     The sHandlerThread name in RttManager is called "WifiScanner".     It should be changed to RTTManager
parents 2752a149 8944741c

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -484,6 +484,9 @@ 
    <!-- Wifi HAL supported PNO -->

    <bool translatable="false" name="config_wifi_hal_pno_enable">false</bool>



    <!-- Wifi SSID white list (can't be enabled if config_wifi_hal_pno_enable is not) -->

    <bool translatable="false" name="config_wifi_ssid_white_list_enable">true</bool>



    <!-- Idle Receive current for wifi radio. 0 by default-->

    <integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ 
  <java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" />

  <java-symbol type="bool" name="config_wifi_hal_pno_enable" />

  <java-symbol type="integer" name="config_windowOutsetBottom" />

  <java-symbol type="bool" name="config_wifi_ssid_white_list_enable" />

  <java-symbol type="integer" name="db_connection_pool_size" />

  <java-symbol type="integer" name="db_journal_size_limit" />

  <java-symbol type="integer" name="db_wal_autocheckpoint" />

wifi/java/android/net/wifi/RttManager.java

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ public class RttManager { 
                    return;

                }



                sHandlerThread = new HandlerThread("WifiScanner");

                sHandlerThread = new HandlerThread("RttManager");

                sAsyncChannel = new AsyncChannel();

                sConnected = new CountDownLatch(1);

wifi/java/android/net/wifi/WifiConfiguration.java

+6 −6

File changed.

Contains only whitespace changes.