Merge lp:~cyphermox/libhybris/android-headers-wifi-compat-check into lp:~ubuntu-core-dev/libhybris/android-headers

[Mathieu Trudel-Lapierre]

debian/patches/wifi_compat_check_avail.patch: add declaration for new method to check that the wifi compat HAL layer is available: wifi_compat_check_availability().

debian/patches/wifi_compat_check_avail.patch: add declaration for new method to check that the wifi compat HAL layer is available: wifi_compat_check_availability().

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-14 04:09:04 +0000
+++ debian/changelog	2014-12-08 16:04:36 +0000
@@ -1,3 +1,11 @@
+android-headers (4.4.2-2-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/wifi_compat_check_avail.patch: add declaration for new
+    method to check that the wifi compat HAL layer is available:
+    wifi_compat_check_availability().
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 08 Dec 2014 11:00:22 -0500
+
 android-headers (4.4.2-2-0ubuntu2) utopic; urgency=medium
 
   * debian/patch/avoid_include_system_properties.patch:

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-08-14 04:08:57 +0000
+++ debian/patches/series	2014-12-08 16:04:36 +0000
@@ -2,3 +2,4 @@
 android_alarm_use_right_include_kernel_userspace.patch
 graphics_h_include_missing_stddef_h.patch
 avoid_include_system_properties.patch
+wifi_compat_check_avail.patch

=== added file 'debian/patches/wifi_compat_check_avail.patch'
--- debian/patches/wifi_compat_check_avail.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/wifi_compat_check_avail.patch	2014-12-08 16:04:36 +0000
@@ -0,0 +1,22 @@
+---
+ hardware_legacy/wifi.h |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: b/hardware_legacy/wifi.h
+===================================================================
+--- a/hardware_legacy/wifi.h
++++ b/hardware_legacy/wifi.h
+@@ -22,6 +22,13 @@ extern "C" {
+ #endif
+ 
+ /**
++ * Check that the wifi HAL layer is available for use.
++ *
++ * @return 1 if the HAL layer is available, 0 otherwise.
++ */
++int wifi_compat_check_availability();
++
++/**
+  * Load the Wi-Fi driver.
+  *
+  * @return 0 on success, < 0 on failure.