commit 9bd16d5f93cfe3853ac02dd2b909bf45a7cc47b4
author Miao Wang <miaowang@google.com> Fri Jun 02 23:20:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 02 23:20:59 2017 +0000
tree 24cda8f8de9fb32f52c50b1beda179df4a377678
parent 257f469fe1ba57b507a680da10b80284f9ab958d
parent 72961fa238a87e5c0c66bf0ab65a738f178c2e2a

Merge "Addd RenderScript default implementation to Bullhead device.mk" into oc-dev

audio_effects.conf

diff --git a/audio_effects.conf b/audio_effects.conf
index e01c6af..d56fd85 100644
--- a/audio_effects.conf
+++ b/audio_effects.conf
@@ -7,22 +7,22 @@
 #    }
 libraries {
   bundle {
-    path /system/lib/soundfx/libbundlewrapper.so
+    path /vendor/lib/soundfx/libbundlewrapper.so
   }
   reverb {
-    path /system/lib/soundfx/libreverbwrapper.so
+    path /vendor/lib/soundfx/libreverbwrapper.so
   }
   visualizer_sw {
-    path /system/lib/soundfx/libvisualizer.so
+    path /vendor/lib/soundfx/libvisualizer.so
   }
   visualizer_hw {
     path /vendor/lib/soundfx/libqcomvisualizer.so
   }
   downmix {
-    path /system/lib/soundfx/libdownmix.so
+    path /vendor/lib/soundfx/libdownmix.so
   }
   proxy {
-    path /system/lib/soundfx/libeffectproxy.so
+    path /vendor/lib/soundfx/libeffectproxy.so
   }
   offload_bundle {
     path /vendor/lib/soundfx/libqcompostprocbundle.so
@@ -31,7 +31,7 @@
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
   loudness_enhancer {
-    path /system/lib/soundfx/libldnhncr.so
+    path /vendor/lib/soundfx/libldnhncr.so
   }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 9759eba..4d2a5cf 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -8,4 +8,22 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IWifi</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.wifi.supplicant</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ISupplicant</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>

wifi/WCNSS_qcom_cfg.ini

diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index 57da027..a802b25 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -695,7 +695,7 @@
 #    g_probe_req_ie_bitmap_0=0x80000009 #[0, 3, 31]
 #    g_probe_req_ie_bitmap_0=0x00000000 #[] (default)
 #    g_probe_req_ie_bitmap_1=0x80000009 #[32, 35, 63]
-g_probe_req_ie_bitmap_0=0x00000009
+g_probe_req_ie_bitmap_0=0x0000000B
 # g_probe_req_ie_bitmap_1=0x00000000
 # g_probe_req_ie_bitmap_2=0x00000000
 # g_probe_req_ie_bitmap_3=0x00000000