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

Commit bc15a1e3 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "wifi: Params for SAR limits" into oc-dr1-dev

parents 9e419d30 aa85acc8

core/res/res/values/config.xml

+8 −0
Original line number Diff line number Diff line
@@ -559,6 +559,14 @@ 
    <!-- Boolean indicating that wifi only link configuratios that have exact same credentials (i.e PSK) -->

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



    <!-- Boolean indicating whether framework needs to set the tx power limit for meeting SAR requirements

         during voice calls -->

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



    <!-- Integer indicating the value that framework needs to set the tx power to for meeting SAR requirements

         during voice calls -->

    <integer translatable="false" name="config_wifi_framework_voice_call_sar_tx_power_limit_in_dbm">0</integer>



    <!-- Wifi driver supports batched scan -->

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

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ 
  <java-symbol type="bool" name="config_windowEnableCircularEmulatorDisplayOverlay" />

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

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

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

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

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

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

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

wifi/java/android/net/wifi/WifiManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1411,6 +1411,8 @@ public class WifiManager { 
    public static final int WIFI_FEATURE_IE_WHITELIST     = 0x1000000; // Probe IE white listing

    /** @hide */

    public static final int WIFI_FEATURE_SCAN_RAND        = 0x2000000; // Random MAC & Probe seq

    /** @hide */

    public static final int WIFI_FEATURE_TX_POWER_LIMIT   = 0x4000000; // Set Tx power limit





    private int getSupportedFeatures() {