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

Commit 5fcdcee0 authored by vandwalle's avatar vandwalle Committed by Android (Google) Code Review
Browse files

Merge "make wifi cellular params configurable" into lmp-dev

parents 645df3e3 2e93c38f

core/res/res/values/config.xml

+21 −1
Original line number Diff line number Diff line
@@ -353,7 +353,27 @@ 
    <integer translatable="false" name="config_wifi_framework_5GHz_preference_penalty_threshold">-75</integer>

    <integer translatable="false" name="config_wifi_framework_5GHz_preference_penalty_factor">2</integer>





    <!-- Integer parameters of the wifi to cellular handover feature

         wifi should not stick to bad networks -->

    <integer translatable="false" name="config_wifi_framework_wifi_score_bad_rssi_threshold_5GHz">-60</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_low_rssi_threshold_5GHz">-72</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_good_rssi_threshold_5GHz">-82</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_bad_rssi_threshold_24GHz">-87</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_low_rssi_threshold_24GHz">-77</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_good_rssi_threshold_24GHz">-65</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_bad_link_speed_24">6</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_bad_link_speed_5">12</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_good_link_speed_24">24</integer>

    <integer translatable="false" name="config_wifi_framework_wifi_score_good_link_speed_5">36</integer>

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



    <!-- Integer packet threshold used to allow scan while associated -->

    <integer translatable="false" name="config_wifi_framework_associated_full_scan_tx_packet_threshold">5</integer>

    <integer translatable="false" name="config_wifi_framework_associated_full_scan_rx_packet_threshold">10</integer>

    <integer translatable="false" name="config_wifi_framework_associated_partial_scan_tx_packet_threshold">40</integer>

    <integer translatable="false" name="config_wifi_framework_associated_partial_scan_rx_packet_threshold">80</integer>

    <integer translatable="false" name="config_wifi_framework_network_switch_tx_packet_threshold">2</integer>

    <integer translatable="false" name="config_wifi_framework_network_switch_rx_packet_threshold">20</integer>



    <!-- Integer indicating wpa_supplicant scan interval in milliseconds -->

    <integer translatable="false" name="config_wifi_supplicant_scan_interval">15000</integer>

core/res/res/values/symbols.xml

+18 −0
Original line number Diff line number Diff line
@@ -312,6 +312,24 @@ 
  <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_max_total_dwell_time" />

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

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

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

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

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

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

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

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

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

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

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

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



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

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

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

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

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

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

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

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

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

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

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

+6 −3
Original line number Diff line number Diff line
@@ -382,10 +382,13 @@ public class WifiConfiguration implements Parcelable { 


    /** The Below RSSI thresholds are used to configure AutoJoin

     *  - GOOD/LOW/BAD thresholds are used so as to calculate link score

     *  - UNWANTED_SOFT are used by the blacklisting logic so as to handle the unwanted network message coming from CS

     *  - UNBLACKLIST thresholds are used so as to tweak the speed at which the network is unblacklisted (i.e. if

     *  - UNWANTED_SOFT are used by the blacklisting logic so as to handle

     *  the unwanted network message coming from CS

     *  - UNBLACKLIST thresholds are used so as to tweak the speed at which

     *  the network is unblacklisted (i.e. if

     *          it is seen with good RSSI, it is blacklisted faster)

     *  - INITIAL_AUTOJOIN_ATTEMPT, used to determine how close from the network we need to be before autojoin kicks in

     *  - INITIAL_AUTOJOIN_ATTEMPT, used to determine how close from

     *  the network we need to be before autojoin kicks in

     */

    /** @hide **/

    public static int INVALID_RSSI = -127;