summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Vandwalle <vandwalle@google.com>2015-04-16 00:24:11 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2015-04-16 00:24:11 +0000
commitcd405fedea1671ca17b149b76b36aa1c57b600f9 (patch)
tree0246e036c00f5cffe879a62f68349f2c1a11ceea
parent66143cacd8bf240701b0a1e4880fe7257a3e83c0 (diff)
parent3876fb57283a482d7dbd6b78b9a7ee12c4e847dd (diff)
downloadframeworks_base-cd405fedea1671ca17b149b76b36aa1c57b600f9.zip
frameworks_base-cd405fedea1671ca17b149b76b36aa1c57b600f9.tar.gz
frameworks_base-cd405fedea1671ca17b149b76b36aa1c57b600f9.tar.bz2
Merge "add HAL PNO config parameter" into m-wireless-dev
-rwxr-xr-xcore/res/res/values/config.xml3
-rwxr-xr-xcore/res/res/values/symbols.xml1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4b28aab..c22a1cb 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -489,6 +489,9 @@
<!-- Wifi driver supports batched scan -->
<bool translatable="false" name="config_wifi_batched_scan_supported">false</bool>
+ <!-- Wifi HAL supported PNO -->
+ <bool translatable="false" name="config_wifi_hal_pno_enable">false</bool>
+
<!-- Idle Receive current for wifi radio. 0 by default-->
<integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 76556ad..d33f667 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -373,6 +373,7 @@
<java-symbol type="integer" name="config_wifi_supplicant_scan_interval" />
<java-symbol type="integer" name="config_wifi_disconnected_scan_interval" />
<java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" />
+ <java-symbol type="bool" name="config_wifi_hal_pno_enable" />
<java-symbol type="integer" name="db_connection_pool_size" />
<java-symbol type="integer" name="db_journal_size_limit" />
<java-symbol type="integer" name="db_wal_autocheckpoint" />