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

Proposed by Mathieu Trudel-Lapierre on 2014-12-08
Status: Merged
Merged at revision: 31
Proposed branch: lp:~cyphermox/libhybris/android-headers-wifi-compat-check
Merge into: lp:~ubuntu-core-dev/libhybris/android-headers
Diff against target: 51 lines (+31/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/series (+1/-0)
debian/patches/wifi_compat_check_avail.patch (+22/-0)
To merge this branch: bzr merge lp:~cyphermox/libhybris/android-headers-wifi-compat-check
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2014-12-08 Pending
Review via email: mp+244011@code.launchpad.net

Commit message

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().

Description of the change

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().

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-14 04:09:04 +0000
3+++ debian/changelog 2014-12-08 16:04:36 +0000
4@@ -1,3 +1,11 @@
5+android-headers (4.4.2-2-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * debian/patches/wifi_compat_check_avail.patch: add declaration for new
8+ method to check that the wifi compat HAL layer is available:
9+ wifi_compat_check_availability().
10+
11+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 08 Dec 2014 11:00:22 -0500
12+
13 android-headers (4.4.2-2-0ubuntu2) utopic; urgency=medium
14
15 * debian/patch/avoid_include_system_properties.patch:
16
17=== modified file 'debian/patches/series'
18--- debian/patches/series 2014-08-14 04:08:57 +0000
19+++ debian/patches/series 2014-12-08 16:04:36 +0000
20@@ -2,3 +2,4 @@
21 android_alarm_use_right_include_kernel_userspace.patch
22 graphics_h_include_missing_stddef_h.patch
23 avoid_include_system_properties.patch
24+wifi_compat_check_avail.patch
25
26=== added file 'debian/patches/wifi_compat_check_avail.patch'
27--- debian/patches/wifi_compat_check_avail.patch 1970-01-01 00:00:00 +0000
28+++ debian/patches/wifi_compat_check_avail.patch 2014-12-08 16:04:36 +0000
29@@ -0,0 +1,22 @@
30+---
31+ hardware_legacy/wifi.h | 7 +++++++
32+ 1 file changed, 7 insertions(+)
33+
34+Index: b/hardware_legacy/wifi.h
35+===================================================================
36+--- a/hardware_legacy/wifi.h
37++++ b/hardware_legacy/wifi.h
38+@@ -22,6 +22,13 @@ extern "C" {
39+ #endif
40+
41+ /**
42++ * Check that the wifi HAL layer is available for use.
43++ *
44++ * @return 1 if the HAL layer is available, 0 otherwise.
45++ */
46++int wifi_compat_check_availability();
47++
48++/**
49+ * Load the Wi-Fi driver.
50+ *
51+ * @return 0 on success, < 0 on failure.

Subscribers

People subscribed via source and target branches