Merge "Add 'basic rates' IE to wifi IE whitelist" into oc-dev
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
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>
