diff options
| author | 2017-07-12 18:33:20 +0000 | |
|---|---|---|
| committer | 2017-07-12 18:33:20 +0000 | |
| commit | bc15a1e3ee8940cacdf64b69c76b44f24df8de3b (patch) | |
| tree | bb92d95e0df18e5cd53f93f94e08daeaaf7fa660 | |
| parent | 9e419d30825934f4f3a38dde6832221f54ef03d2 (diff) | |
| parent | aa85acc8e0395344c5d00abb3d5d64e24031a296 (diff) | |
Merge "wifi: Params for SAR limits" into oc-dr1-dev
| -rw-r--r-- | core/res/res/values/config.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ab909cf922c0..4520f75b2b83 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ad9b5af37788..21350276df52 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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" /> diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 4ae2c01f90ca..7173775a34fa 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -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() { |