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

Commit bba3c542 authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by android-build-merger
Browse files

Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev 

am: ef4a56f9

Change-Id: I623d20464db6ebd8efe589987606f23c870d6283
parents abac6b84 ef4a56f9

core/res/res/values/config.xml

+21 −3
Original line number Diff line number Diff line
@@ -659,9 +659,27 @@ 
    <!-- 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>

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

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



    <!-- Boolean indicating whether framework needs to use body proximity to set the tx power limit

         for meeting SAR requirements -->

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



    <!-- String for the sensor type for body/head proximity for SAR -->

    <string translatable="false" name="config_wifi_sar_sensor_type"></string>



    <!-- Integer indicating event id by sar sensor for free space -->

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



    <!-- Integer indicating event id by sar sensor for near hand -->

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



    <!-- Integer indicating event id by sar sensor for near head -->

    <integer translatable="false" name="config_wifi_framework_sar_near_head_event_id">3</integer>



    <!-- Integer indicating event id by sar sensor for near body -->

    <integer translatable="false" name="config_wifi_framework_sar_near_body_event_id">4</integer>



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

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

core/res/res/values/symbols.xml

+7 −1
Original line number Diff line number Diff line
@@ -336,7 +336,13 @@ 
  <java-symbol type="bool" name="config_wifi_framework_enable_associated_network_selection" />

  <java-symbol type="bool" name="config_wifi_framework_use_single_radio_chain_scan_results_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="bool" name="config_wifi_framework_enable_sar_tx_power_limit" />

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

  <java-symbol type="string" name="config_wifi_sar_sensor_type" />

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

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

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

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

  <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" />