From fc197d392300116b47c87dcc87453c3465ca6ce2 Mon Sep 17 00:00:00 2001
From: Pierre Vandwalle <vandwalle@google.com>
Date: Tue, 14 Apr 2015 15:33:22 -0700
Subject: [PATCH 1/2] add disconnected scan parameter, add bytes[] container to
 scanResults

Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
---
 core/res/res/values/config.xml             | 3 +++
 core/res/res/values/symbols.xml            | 1 +
 wifi/java/android/net/wifi/ScanResult.java | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 83360584d21c9..ac623190ab96c 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -423,6 +423,9 @@
          point on the move. A value of 0 means no periodic scans will be used in the framework. -->
     <integer translatable="false" name="config_wifi_framework_scan_interval">300000</integer>
 
+    <!-- Integer indicating disconnect mode scan interval in milliseconds -->
+    <integer translatable="false" name="config_wifi_disconnected_scan_interval">15000</integer>
+
     <!-- Integer indicating associated partial scan interval in milliseconds -->
     <integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ac8216e81bc70..84a602dac5032 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -378,6 +378,7 @@
   <java-symbol type="integer" name="config_shortPressOnSleepBehavior" />
   <java-symbol type="integer" name="config_wifi_framework_scan_interval" />
   <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="integer" name="db_connection_pool_size" />
   <java-symbol type="integer" name="db_journal_size_limit" />
diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index e8a51e336f7d8..5dc70bd49baf0 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -261,6 +261,12 @@ public class ScanResult implements Parcelable {
         return freq > 4900 && freq < 5900;
     }
 
+    /**
+     *  @hide
+     * storing the raw bytes of full result IEs
+     **/
+    public byte[] bytes;
+
     /** information element from beacon
      * @hide
      */

From 37f6b9307d7079b43ed8858c399324e53404516f Mon Sep 17 00:00:00 2001
From: Pierre Vandwalle <vandwalle@google.com>
Date: Wed, 15 Apr 2015 15:26:30 -0700
Subject: [PATCH 2/2] add HAL PNO config parameter

Change-Id: I847ec3a9cbd9f0036a4de7b88667f26f7880d7b1
---
 core/res/res/values/config.xml  | 3 +++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index ac623190ab96c..07f8c60e834d5 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -475,6 +475,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 84a602dac5032..35c6988d58a03 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -380,6 +380,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" />