summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roshan Pius <rpius@google.com> 2017-07-28 02:51:48 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-28 02:51:48 +0000
commit4eaed2ba11a14464e6e73335b188050554f4e08c (patch)
treec97d6afdabdef0f7847b02e71f822c6777816a2a
parent7ce226bd6ca464480b90cfb336bd7b677ce88f4c (diff)
parent633fffbc0cb58d4b4ad2e3e0cac0dba25aea0aab (diff)
Merge "wifi: Modify the SAR power levels interface" into oc-dr1-dev
am: 633fffbc0c Change-Id: Iaa7a5e2b5858a6cd28a5d3f14e309b2dd3118173
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 0 insertions, 5 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index a29adc5e2f1e..479a2753facb 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -577,10 +577,6 @@
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>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 571292381cf1..d738556b4359 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -313,7 +313,6 @@
<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" />