OSDN Git Service
Elliott Hughes [Fri, 31 Jul 2015 16:00:19 +0000 (16:00 +0000)]
Merge "Stop being silly."
Elliott Hughes [Fri, 31 Jul 2015 15:54:02 +0000 (08:54 -0700)]
Stop being silly.
Change-Id: Ifb26361dae95a08827fcac6e725ab8f7961c78aa
Nick Kralevich [Fri, 8 May 2015 19:27:54 +0000 (19:27 +0000)]
Merge "power.c: add O_CLOEXEC on wakelocks"
Nick Kralevich [Fri, 8 May 2015 19:13:51 +0000 (12:13 -0700)]
power.c: add O_CLOEXEC on wakelocks
Ensure that FDs associated with /sys/power/wake_lock and
/sys/power/wake_unlock are closed on exec.
Change-Id: Ia2c8937cf6a1fdd6564fad4785642934c805cf22
Mark Salyzyn [Wed, 1 Apr 2015 16:46:18 +0000 (16:46 +0000)]
Merge "wifi missing include for sys/stat.h"
Mark Salyzyn [Wed, 1 Apr 2015 14:33:14 +0000 (07:33 -0700)]
wifi missing include for sys/stat.h
wifi.c gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.
Bug:
19908228
Change-Id: Ie84477137dba47af385163decbb41b03e2aeaed4
Elliott Hughes [Fri, 30 Jan 2015 04:24:56 +0000 (04:24 +0000)]
am
821b26b0: Merge "Add missing <malloc.h> include."
* commit '
821b26b0e07500c88d980e77bb12b647301c7335':
Add missing <malloc.h> include.
Elliott Hughes [Fri, 30 Jan 2015 04:10:10 +0000 (04:10 +0000)]
Merge "Add missing <malloc.h> include."
Elliott Hughes [Fri, 30 Jan 2015 01:10:03 +0000 (17:10 -0800)]
Add missing <malloc.h> include.
Change-Id: Ia5c6a5f00ed67488746b2ca85aa21f2ebfee510e
Elliott Hughes [Mon, 12 Jan 2015 21:50:01 +0000 (21:50 +0000)]
am
82753d5a: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES."
* commit '
82753d5ace78be86dddfb1babf9f3f897a76820f':
Remove HAVE_LIBC_SYSTEM_PROPERTIES.
Elliott Hughes [Mon, 12 Jan 2015 21:39:30 +0000 (21:39 +0000)]
Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES."
Elliott Hughes [Mon, 12 Jan 2015 19:38:56 +0000 (11:38 -0800)]
Remove HAVE_LIBC_SYSTEM_PROPERTIES.
Change-Id: I2259c5159f1f6cc770b3920bff00af2cf2594b6c
Eric Laurent [Wed, 26 Nov 2014 12:01:47 +0000 (12:01 +0000)]
am
e714af92: audio policy: use legacy stream type definitions
* commit '
e714af927c1e87a488178315b78b0c12c0ec9db9':
audio policy: use legacy stream type definitions
Eric Laurent [Tue, 11 Nov 2014 22:01:13 +0000 (14:01 -0800)]
audio policy: use legacy stream type definitions
New stream types have been added, so make sure that
legacy implementation uses legacy stream definitions
Bug:
18067208
Change-Id: I8042ebe9ac3e7eda380b8c91650f2ac16b44bc34
Glenn Kasten [Fri, 7 Nov 2014 16:13:56 +0000 (16:13 +0000)]
am
b4b0608b: Merge "legacy audio policy: check string parameters before use" into lmp-mr1-dev
* commit '
b4b0608b0560a7cad27aeec0af8b1728b971aa3a':
legacy audio policy: check string parameters before use
Glenn Kasten [Fri, 7 Nov 2014 15:59:45 +0000 (15:59 +0000)]
Merge "legacy audio policy: check string parameters before use" into lmp-mr1-dev
Glenn Kasten [Thu, 6 Nov 2014 01:34:39 +0000 (17:34 -0800)]
legacy audio policy: check string parameters before use
Bug:
18262893
Change-Id: Iee6e59db7ffae5612256ba1f74aba62bc8cf12db
Hochi Huang [Tue, 28 Oct 2014 20:30:02 +0000 (20:30 +0000)]
am
69f48b86: [AU]Buganizer ID:
17182487, sprout audio HAL should mute all audio output with property ro.audio.silent set to true
* commit '
69f48b86d78ac8968ccafc6287eed3079f1cb56e':
[AU]Buganizer ID:
17182487, sprout audio HAL should mute all audio output with property ro.audio.silent set to true
Vinit Deshpande [Mon, 27 Oct 2014 04:21:18 +0000 (04:21 +0000)]
am
62e06c83: am
e96b538e: Merge "Wifi Hal: Extend feature set to advertise link layer stats support" into lmp-dev
* commit '
62e06c838de988286d5d4ddd1d8a30f8af980139':
Amarnath Hullur Subramanyam [Mon, 27 Oct 2014 04:21:18 +0000 (04:21 +0000)]
am
8d15568d: am
2a441bce: Revert "Wifi Hal: Nan Header file"
* commit '
8d15568df598b1a9ca5059ba8de7ec398fdfc241':
Hochi Huang [Tue, 26 Aug 2014 09:39:03 +0000 (17:39 +0800)]
[AU]Buganizer ID:
17182487, sprout audio HAL should mute all audio output with property ro.audio.silent set to true
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Change-Id: I1bda15838da409d08f9ed0e8023b93023109cb2d
(cherry picked from commit
a9a3b5d93ee90c21619ddb6a606d24325109e914)
Dmitry Shmidt [Wed, 8 Oct 2014 18:45:55 +0000 (18:45 +0000)]
am
67741614: wifi: Sync with wpa_supplicant
9ead16e (
d5fe4e6)
* commit '
677416147e3b2b398db45d2194cd8a2c396410ce':
wifi: Sync with wpa_supplicant
9ead16e (
d5fe4e6)
Dmitry Shmidt [Wed, 8 Oct 2014 17:53:15 +0000 (10:53 -0700)]
wifi: Sync with wpa_supplicant
9ead16e (
d5fe4e6)
Change-Id: Iee4aabf0a8259bb74bacde1c7045cfa2468035a7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Mon, 6 Oct 2014 23:40:56 +0000 (23:40 +0000)]
am
9dd37a67: wifi: Sync with wpa_supplicant commit
661b4f7 (
a313d17)
* commit '
9dd37a671485efd40db73335ba2f0f5a87555e46':
wifi: Sync with wpa_supplicant commit
661b4f7 (
a313d17)
Dmitry Shmidt [Mon, 6 Oct 2014 22:13:16 +0000 (15:13 -0700)]
wifi: Sync with wpa_supplicant commit
661b4f7 (
a313d17)
Bug:
17882233
Change-Id: I32d93380f6fb80409e45e6ec9983bb2f381c2319
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Hochi Huang [Thu, 25 Sep 2014 07:08:45 +0000 (07:08 +0000)]
am
8ddf81e2: [AU] Update volume setting and Audio Device API 3.0
* commit '
8ddf81e20fd514907de51ec82a617143d2e35276':
[AU] Update volume setting and Audio Device API 3.0
Hochi Huang [Sun, 21 Sep 2014 01:40:30 +0000 (09:40 +0800)]
[AU] Update volume setting and Audio Device API 3.0
Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Vinit Deshpande [Tue, 23 Sep 2014 15:52:06 +0000 (15:52 +0000)]
am
e96b538e: Merge "Wifi Hal: Extend feature set to advertise link layer stats support" into lmp-dev
* commit '
e96b538e168846a31edd7c608267d79f3f30b871':
Wifi Hal: Extend feature set to advertise link layer stats support
Amarnath Hullur Subramanyam [Tue, 23 Sep 2014 15:52:05 +0000 (15:52 +0000)]
am
2a441bce: Revert "Wifi Hal: Nan Header file"
* commit '
2a441bce2825f1c186071af55c1807e1688f9d3b':
Revert "Wifi Hal: Nan Header file"
Vinit Deshpande [Tue, 23 Sep 2014 03:06:54 +0000 (03:06 +0000)]
am
e96b538e: Merge "Wifi Hal: Extend feature set to advertise link layer stats support" into lmp-dev
* commit '
e96b538e168846a31edd7c608267d79f3f30b871':
Wifi Hal: Extend feature set to advertise link layer stats support
Amarnath Hullur Subramanyam [Tue, 23 Sep 2014 03:06:53 +0000 (03:06 +0000)]
am
2a441bce: Revert "Wifi Hal: Nan Header file"
* commit '
2a441bce2825f1c186071af55c1807e1688f9d3b':
Revert "Wifi Hal: Nan Header file"
Vinit Deshpande [Tue, 23 Sep 2014 02:16:43 +0000 (02:16 +0000)]
Merge "Wifi Hal: Extend feature set to advertise link layer stats support" into lmp-dev
Amarnath Hullur Subramanyam [Thu, 11 Sep 2014 17:01:36 +0000 (10:01 -0700)]
Wifi Hal: Extend feature set to advertise link layer stats support
Added a new macro in feature set to indicate wifihal support for
link layer stats collection.
Bug:
17359758
Change-Id: I3f8ecce67430bd8270fb157a4e6cd246503a3d9f
Amarnath Hullur Subramanyam [Tue, 9 Sep 2014 03:25:57 +0000 (20:25 -0700)]
Revert "Wifi Hal: Nan Header file"
This reverts commit
5f11341f2f5165f25e108d9519f08d78704b8ae7.
Bug:
17359758
Change-Id: I5f2b94d2288e1400558c1de8a2ab25f05155aca8
Qiming Shi [Mon, 8 Sep 2014 21:32:45 +0000 (21:32 +0000)]
am
b111e7ec: DO NOT MERGE - openOutputStreamWithFlags should be declared as abstract function
* commit '
b111e7ecc6789dade2818782da6b33e1d187e344':
DO NOT MERGE - openOutputStreamWithFlags should be declared as abstract function
Qiming Shi [Mon, 26 May 2014 00:17:28 +0000 (08:17 +0800)]
DO NOT MERGE - openOutputStreamWithFlags should be declared as abstract function
Bug:
17416117.
Change-Id: Ia9150944977560ea296c46ddf75da960d6a3e541
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
Dmitry Shmidt [Tue, 26 Aug 2014 18:01:44 +0000 (18:01 +0000)]
am
fddda3f9: wifi: hal: Add wifi_set_nodfs_flag() function
* commit '
fddda3f935c6eb21c70eede106baa9c85cc5bfdb':
wifi: hal: Add wifi_set_nodfs_flag() function
Dmitry Shmidt [Mon, 25 Aug 2014 17:33:19 +0000 (10:33 -0700)]
wifi: hal: Add wifi_set_nodfs_flag() function
Bug:
17181998
Change-Id: Iac431c2804e8252273e00c7b490c955f5528c83e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 15 Aug 2014 11:48:23 +0000 (11:48 +0000)]
am
d83e4abc: wifi: Sync with wpa_supplicant commit
0365883 (
4aa9c15)
* commit '
d83e4abc7fb074e4f9bfe685128a19b7785ae635':
wifi: Sync with wpa_supplicant commit
0365883 (
4aa9c15)
Dmitry Shmidt [Thu, 14 Aug 2014 22:48:13 +0000 (15:48 -0700)]
wifi: Sync with wpa_supplicant commit
0365883 (
4aa9c15)
Bug:
17027752
Change-Id: Ibf1a23a6750ec041ec068070791037fdc538b13e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ashwin [Tue, 12 Aug 2014 04:58:00 +0000 (04:58 +0000)]
am
726b5dad: PNO MAC rotation + Hotlist LOST event
* commit '
726b5dada8055f705bb1ffb67d9acc3cad99457d':
PNO MAC rotation + Hotlist LOST event
Ashwin [Mon, 4 Aug 2014 23:50:23 +0000 (16:50 -0700)]
PNO MAC rotation + Hotlist LOST event
modified: include/hardware_legacy/gscan.h
modified: include/hardware_legacy/wifi_hal.h
Change-Id: I0ad599a20210081ffd05040fbb810f1ec1f9dd62
Eric Laurent [Tue, 29 Jul 2014 15:24:23 +0000 (15:24 +0000)]
am
4c20a09e: Merge "openOutputStreamWithFlags should be declared as abstract function"
* commit '
4c20a09e8684657448f0bc97a2da4e56c94d484e':
openOutputStreamWithFlags should be declared as abstract function
Eric Laurent [Mon, 28 Jul 2014 21:09:20 +0000 (21:09 +0000)]
am
a311a983: audio HAL: add parameters to open stream functions
* commit '
a311a983eb4035b272033105119cb44d814fb2db':
audio HAL: add parameters to open stream functions
Eric Laurent [Mon, 28 Jul 2014 00:30:34 +0000 (17:30 -0700)]
audio HAL: add parameters to open stream functions
Pass device address (and audio source for inputs) to
open_output_stream() and open_input_stream() audio HAL functions.
Bug:
14815883.
Change-Id: Ib1c3e98518733fa5eab54cbca4220e388d3f6211
Eric Laurent [Tue, 29 Jul 2014 15:16:21 +0000 (15:16 +0000)]
Merge "openOutputStreamWithFlags should be declared as abstract function"
Eric Laurent [Wed, 23 Jul 2014 16:06:22 +0000 (16:06 +0000)]
am
39b3abc0: Merge "audio: add mechanism to re-route nullified audio"
* commit '
39b3abc0ca227d72f66bb47a75cec2acfb4d6de0':
audio: add mechanism to re-route nullified audio
Eric Laurent [Wed, 23 Jul 2014 16:00:53 +0000 (16:00 +0000)]
Merge "audio: add mechanism to re-route nullified audio"
Qiming Shi [Mon, 26 May 2014 00:17:28 +0000 (08:17 +0800)]
openOutputStreamWithFlags should be declared as abstract function
Change-Id: Ia9150944977560ea296c46ddf75da960d6a3e541
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
Glenn Kasten [Thu, 17 Jul 2014 14:28:11 +0000 (07:28 -0700)]
Add audio_input_flags_t to HAL open_input_stream
Change-Id: I17db01e92bfa939c7a15e7f9f95197d0a0568033
Vincent Becker [Mon, 3 Sep 2012 06:29:57 +0000 (14:29 +0800)]
audio: add mechanism to re-route nullified audio
Fixes a race condition whereby two requests attempt to change the audio stream
(and interrupt each other). For example, a user space app makes a call through
the audio API and before completion, a kernel function such as jack removal is
detected and is serviced. In this case, you have a nullified audio route that
needs to be re-routed.
In order to know a routing update is needed, a boolean member mForceRouting
has been introduced to enforce routing for the next attempt to set audio output
with a non-null device.
Change-Id: Ia0aa2f27fe63c39f0980dec2e1e79dbc26b81e56
Author: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: Zhi Jin <zhi.jin@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Robert Beatty <robert.m.beatty@intel.com>
Amarnath Hullur Subramanyam [Tue, 17 Jun 2014 02:50:24 +0000 (19:50 -0700)]
Wifi Hal: Adding inclusion of stdint.h in wifi_hal.h
Change-Id: I8c7c103c5b12e2b9dc82f9cfd429f22d6ebfb943
Ashwin [Wed, 25 Jun 2014 23:32:06 +0000 (16:32 -0700)]
Get feature list
Changes to be committed:
modified: include/hardware_legacy/wifi_hal.h
Change-Id: Ie69797500c2d80fa758e6ee6a42ffca9b3b46fcb
Vinit Deshpande [Mon, 7 Jul 2014 18:45:54 +0000 (11:45 -0700)]
Introduce TDLS APIs in wifi HAL
Change-Id: I611012412f58682ea11179631622023eda5393e7
Ashwin [Fri, 6 Jun 2014 22:08:29 +0000 (15:08 -0700)]
Fix wifi_rtt_range_cancel to include interface handle
Change-Id: I1bdb2f74a14a7f15dbf00634570341e70df67498
Eric Laurent [Wed, 2 Jul 2014 03:33:36 +0000 (20:33 -0700)]
audio: fixed channel count determination from channel mask
Do not use popcount() to derive channel count from channel mask.
Bug:
15000850.
Change-Id: I5050ce7fd7884369eb0de37967e40052630006a9
Paul McLean [Thu, 26 Jun 2014 22:38:35 +0000 (15:38 -0700)]
Enabling USB Device and Android Device Vol inc/dec functionality
for USB Audio Output
Bug:
13747844
Change-Id: I53b7db8102fd2ed24014c338ea5e7290cda8b2f3
Dmitry Shmidt [Mon, 23 Jun 2014 19:23:50 +0000 (12:23 -0700)]
wifi: Sync with wpa_supplicant commit
2271d3f (
f95a452)
Change-Id: I9319bebe813f2306700571fd31570f2d30a8004d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Wed, 11 Jun 2014 01:39:05 +0000 (18:39 -0700)]
audio policy: add parsing for more audio formats
Bug:
9428304.
Change-Id: Ie3c9827ed78703a1b2d9699e38ce628f3055138b
Amarnath Hullur Subramanyam [Sun, 1 Jun 2014 17:19:23 +0000 (10:19 -0700)]
Wifi Hal: Nan Header file
Change-Id: I65a072ffa491d3f61289034e0326df131ec159ba
Kumar Anand [Thu, 29 May 2014 10:20:15 +0000 (03:20 -0700)]
Wi-Fi HAL API cleanup
Removed unused APIs, added new typedef s8,
Added default enum for wifi_interface_mode
Change-Id: I7be61fb1c0f7babcfbfc18940e4a5fa83792b248
Vinit Deshpande [Wed, 28 May 2014 23:33:31 +0000 (16:33 -0700)]
More GScan API changes
Main changes are -
1. max_bssid_history_entries in wifi_gscan_capabilities
2. A new callback to report extra status of scan
3. Channel hint for hotlist APs
4. More details on significant change event
Change-Id: I665cb28df99cf152e6b95c8050ea246c5fce81e9
Vinit Deshpande [Wed, 28 May 2014 01:00:14 +0000 (18:00 -0700)]
Fix build breaks caused by duplicate definitions
Some types are defined in link_layer_stats.h as well as rtt.h; this
change removes duplicate definitions
Change-Id: If1e16b7868c7ad7f9b5ca4d020d26df4c17daf0a
Vinit Deshpande [Fri, 23 May 2014 01:11:12 +0000 (18:11 -0700)]
RTT API Update
This version introduces channel parameters and channel masks.
Change-Id: Ieab4e965de77a3c70826842e98f4da14cf09b03d
Dmitry Shmidt [Mon, 2 Jun 2014 18:30:43 +0000 (11:30 -0700)]
wifi: Sync with wpa_supplicant commit
76cd2cc (
147848e)
Change-Id: I42bc6906cc1dde27ce8ba38f0f919d2c791c09bb
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Fri, 30 May 2014 17:09:19 +0000 (17:09 +0000)]
Merge "handle in and out audio device connection separately"
Eric Laurent [Thu, 29 May 2014 23:14:44 +0000 (16:14 -0700)]
handle in and out audio device connection separately
AudioService now indicates in and out device connection
separately in case of combined devices like wired headset
or BT SCO headset.
Change-Id: Id20e02bb351cc732ceddccf597742ced049671a8
Vinit Deshpande [Thu, 29 May 2014 23:06:18 +0000 (23:06 +0000)]
Merge "Remove duplicate copies of nl80211_copy.h"
Mike Lockwood [Wed, 21 May 2014 16:28:05 +0000 (09:28 -0700)]
AudioPolicyManagerBase: Add support for A2DP sink input
Change-Id: I500d1f2f8f2199c674b289cf671b7f863a7d02ee
Vinit Deshpande [Fri, 23 May 2014 00:31:13 +0000 (17:31 -0700)]
Remove duplicate copies of nl80211_copy.h
We'll use a single copy - the one in external/wpa_supplicant_8 project.
Bug:
14889555
Change-Id: I2e432bddcff278e792579970122cdea9e80ffb64
Vinit Deshapnde [Tue, 13 May 2014 22:10:49 +0000 (15:10 -0700)]
changes related to full scan result and band
Change-Id: I7accbd79f86a616c1d7e11fcebae12dbefaa3612
vandwalle [Thu, 8 May 2014 23:57:05 +0000 (16:57 -0700)]
fix build compile
Change-Id: Ic9ffdfb23fa704d636a5f0106a205af3693d3a20
Chilam Ng [Sat, 3 May 2014 00:09:03 +0000 (17:09 -0700)]
Include hal link_layer_stats.h
Change-Id: Ic86065863c7b3d6a40101724f4e7d8a8263d62b5
Signed-off-by: Chilam Ng <chilam@broadcom.com>
Vinit Deshapnde [Thu, 1 May 2014 21:21:44 +0000 (14:21 -0700)]
Introduce Link Layer Stats API
Change-Id: Ie3b3a1a511026aafbd46f8165272059ce856992d
Dmitry Shmidt [Thu, 15 May 2014 16:32:02 +0000 (16:32 +0000)]
am
9595dc8c: am
4248e7c3: am
a5b275c3: Merge "Changes to restart supplicant on crash"
* commit '
9595dc8c8e07d40d606f11fedb7afb035bc87eb2':
Changes to restart supplicant on crash
Dmitry Shmidt [Thu, 15 May 2014 16:29:43 +0000 (16:29 +0000)]
am
4248e7c3: am
a5b275c3: Merge "Changes to restart supplicant on crash"
* commit '
4248e7c3cc06244b9d80a470e65dc95f862fccfa':
Changes to restart supplicant on crash
Dmitry Shmidt [Thu, 15 May 2014 16:28:02 +0000 (16:28 +0000)]
am
a5b275c3: Merge "Changes to restart supplicant on crash"
* commit '
a5b275c3c64a718321f0731c49a338c6775f4273':
Changes to restart supplicant on crash
Dmitry Shmidt [Thu, 15 May 2014 16:25:01 +0000 (16:25 +0000)]
Merge "Changes to restart supplicant on crash"
Mahesh [Wed, 14 May 2014 13:26:15 +0000 (18:56 +0530)]
Changes to restart supplicant on crash
specify timeout value in poll to check if the supplicant
connection is active, if not we should indicate
terminate command to framework to restart supplicant.
Change-Id: I8e602b9cb07a13c3f0b96813b2fc89f46457473e
Dmitry Shmidt [Wed, 14 May 2014 00:00:20 +0000 (00:00 +0000)]
am
384bd5d6: am
7b11946c: am
9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
* commit '
384bd5d631a9d493d65afac4ce21a751e8cd2c68':
Indicate WPA_EVENT_TERMINATING event on primary interface.
Dmitry Shmidt [Tue, 13 May 2014 23:53:15 +0000 (23:53 +0000)]
am
7b11946c: am
9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
* commit '
7b11946c48ebfab9b6a5d2c64366f19727d3a0af':
Indicate WPA_EVENT_TERMINATING event on primary interface.
Dmitry Shmidt [Tue, 13 May 2014 23:48:32 +0000 (23:48 +0000)]
am
9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
* commit '
9739aeb214087ef5dc0cfe7e4bd5f87904cefb92':
Indicate WPA_EVENT_TERMINATING event on primary interface.
Dmitry Shmidt [Tue, 13 May 2014 23:43:40 +0000 (23:43 +0000)]
Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
Mahesh [Tue, 13 May 2014 08:29:05 +0000 (13:59 +0530)]
Indicate WPA_EVENT_TERMINATING event on primary interface.
Internal fabricated WPA_EVENT_TERMINATING events to restart
supplicant should be sent on primary interface.
Change-Id: I2d018e0707819614d9b092c6f3a812f04b5446ca
Eric Laurent [Thu, 8 May 2014 18:24:06 +0000 (18:24 +0000)]
am
62038fc4: am
2c388a44: am
8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"
* commit '
62038fc4c5c596f04a87388bb42bdef13d359c39':
Audio: add an openOutputStreamWithFlags API
Vinit Deshapnde [Fri, 11 Apr 2014 18:10:14 +0000 (11:10 -0700)]
Introduce on_full_scan_result event in WifiHal
This change will allow the hardware to report all IEs found in the probe
response.
Change-Id: I149900c63a301df84fd6ff6eb1a1f3773daa0111
Vinit Deshapnde [Wed, 9 Apr 2014 00:05:19 +0000 (17:05 -0700)]
Moving Wifi HAL to hardware
This change moves all Wifi HAL headers to libhardware_legacy; and moves
hal implementation under hardware/<vendor>/wlan. This way different
vendors will be able to tailor implementation to their drivers.
Change-Id: I55789bb6788ab694f4896aa36d76f7887b32dad6
Eric Laurent [Wed, 7 May 2014 23:39:02 +0000 (23:39 +0000)]
am
2c388a44: am
8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"
* commit '
2c388a441da4a43904ac333a66bb3d5e26a8aa3a':
Audio: add an openOutputStreamWithFlags API
Eric Laurent [Wed, 7 May 2014 23:36:36 +0000 (23:36 +0000)]
am
8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"
* commit '
8eb3354ad06cc4f24375d076698b35d2c26f0e90':
Audio: add an openOutputStreamWithFlags API
Eric Laurent [Wed, 7 May 2014 23:34:19 +0000 (23:34 +0000)]
Merge "Audio: add an openOutputStreamWithFlags API"
Paul McLean [Wed, 30 Apr 2014 15:26:04 +0000 (15:26 +0000)]
Merge "Update policy handling for USB inputs"
Bill Yi [Wed, 30 Apr 2014 12:50:29 +0000 (12:50 +0000)]
Bill Yi [Wed, 30 Apr 2014 00:59:07 +0000 (00:59 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:21 +0000 (11:34 -0700)]
Paul McLean [Fri, 18 Apr 2014 21:01:12 +0000 (14:01 -0700)]
Update policy handling for USB inputs
Change-Id: Ib2e531f115f8bd1d5f290094032f3f4a4753e726
Colin Cross [Thu, 24 Apr 2014 15:39:41 +0000 (08:39 -0700)]
resolved conflicts for merge of
75402fdb to master
Change-Id: Ie85a3c7d498d7685738190267916e9a205cc469e
Colin Cross [Thu, 24 Apr 2014 08:58:31 +0000 (08:58 +0000)]
am
64527db9: Merge "audio: allow compiling for 64-bit"
* commit '
64527db9b27d5f36412fefcd07c7054277ecf6c7':
audio: allow compiling for 64-bit
Colin Cross [Wed, 23 Apr 2014 22:04:44 +0000 (22:04 +0000)]
Merge "audio: allow compiling for 64-bit"
David Wagner [Wed, 23 Apr 2014 09:47:02 +0000 (11:47 +0200)]
Audio: add an openOutputStreamWithFlags API
The existing openOutputStream API did not allow passing stream flags even
though its audio hardware interface's open_output_stream counterpart does take
a "flags" argument. This means that, when the audio hw_module is implemented
using libhardware_legacy, the output flag was lost.
This commit adds an API in libhardware_legacy's audio module, allowing to pass
the flag, and updates the default wrapper in order to call this new API instead
of the old version that missed the flag.
Change-Id: I20c102d32b489f87fabbd7d02aa0b28fae13948b
Signed-off-by: David Wagner <david.wagner@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Colin Cross [Fri, 18 Apr 2014 22:39:10 +0000 (15:39 -0700)]
audio: allow compiling for 64-bit
Fix a few 64-bit warnings and set -Wno-unused-parameter, which makes
the directory warnings-clean on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: I688b31683f1a6598419866d9b7b6bc27a7056f4a