Commit graph

714 commits

Author SHA1 Message Date
Vincent Becker
31de680d56 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>
2014-07-16 17:45:43 -07:00
Amarnath Hullur Subramanyam
9c69eebbae Wifi Hal: Adding inclusion of stdint.h in wifi_hal.h
Change-Id: I8c7c103c5b12e2b9dc82f9cfd429f22d6ebfb943
2014-07-10 12:29:32 -07:00
Ashwin
ef24fac49d Get feature list
Changes to be committed:

	modified:   include/hardware_legacy/wifi_hal.h

Change-Id: Ie69797500c2d80fa758e6ee6a42ffca9b3b46fcb
2014-07-10 10:51:36 -07:00
Vinit Deshpande
044c10e9ef Introduce TDLS APIs in wifi HAL
Change-Id: I611012412f58682ea11179631622023eda5393e7
2014-07-10 10:51:28 -07:00
Ashwin
93f677b670 Fix wifi_rtt_range_cancel to include interface handle
Change-Id: I1bdb2f74a14a7f15dbf00634570341e70df67498
2014-07-10 10:51:19 -07:00
Eric Laurent
40508f66ca audio: fixed channel count determination from channel mask
Do not use popcount() to derive channel count from channel mask.

Bug: 15000850.
Change-Id: I5050ce7fd7884369eb0de37967e40052630006a9
2014-07-01 20:33:36 -07:00
Paul McLean
03d92f4a6e Enabling USB Device and Android Device Vol inc/dec functionality
for USB Audio Output

Bug: 13747844
Change-Id: I53b7db8102fd2ed24014c338ea5e7290cda8b2f3
2014-06-27 08:48:20 -07:00
Dmitry Shmidt
629b95b3e8 wifi: Sync with wpa_supplicant commit 2271d3f (f95a452)
Change-Id: I9319bebe813f2306700571fd31570f2d30a8004d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-23 12:23:50 -07:00
Eric Laurent
d97aa170de audio policy: add parsing for more audio formats
Bug: 9428304.
Change-Id: Ie3c9827ed78703a1b2d9699e38ce628f3055138b
2014-06-19 10:10:54 -07:00
Amarnath Hullur Subramanyam
5f11341f2f Wifi Hal: Nan Header file
Change-Id: I65a072ffa491d3f61289034e0326df131ec159ba
2014-06-10 12:45:31 -07:00
Kumar Anand
17052b7966 Wi-Fi HAL API cleanup
Removed unused APIs, added new typedef s8,
Added default enum for wifi_interface_mode

Change-Id: I7be61fb1c0f7babcfbfc18940e4a5fa83792b248
2014-06-10 12:44:47 -07:00
Vinit Deshpande
fdb49e3d2b 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
2014-06-10 12:44:31 -07:00
Vinit Deshpande
9bd2fd86c9 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
2014-06-10 12:44:19 -07:00
Vinit Deshpande
424a9d0ac7 RTT API Update
This version introduces channel parameters and channel masks.

Change-Id: Ieab4e965de77a3c70826842e98f4da14cf09b03d
2014-06-10 12:43:02 -07:00
Dmitry Shmidt
1d9576d015 wifi: Sync with wpa_supplicant commit 76cd2cc (147848e)
Change-Id: I42bc6906cc1dde27ce8ba38f0f919d2c791c09bb
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-02 11:32:12 -07:00
Eric Laurent
f466bfe146 Merge "handle in and out audio device connection separately" 2014-05-30 17:09:19 +00:00
Eric Laurent
806fab660a 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
2014-05-29 16:14:44 -07:00
Vinit Deshpande
e1edbe6c11 Merge "Remove duplicate copies of nl80211_copy.h" 2014-05-29 23:06:19 +00:00
Mike Lockwood
33bf1b0fe3 AudioPolicyManagerBase: Add support for A2DP sink input
Change-Id: I500d1f2f8f2199c674b289cf671b7f863a7d02ee
2014-05-28 12:21:52 -07:00
Vinit Deshpande
26da882d92 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
2014-05-22 17:31:13 -07:00
Vinit Deshapnde
b26e377bb1 changes related to full scan result and band
Change-Id: I7accbd79f86a616c1d7e11fcebae12dbefaa3612
2014-05-16 16:33:36 -07:00
vandwalle
73efd5b991 fix build compile
Change-Id: Ic9ffdfb23fa704d636a5f0106a205af3693d3a20
2014-05-15 17:06:21 -07:00
Chilam Ng
d1940c016f Include hal link_layer_stats.h
Change-Id: Ic86065863c7b3d6a40101724f4e7d8a8263d62b5
Signed-off-by: Chilam Ng <chilam@broadcom.com>
2014-05-15 17:06:02 -07:00
Vinit Deshapnde
cb2c4baad6 Introduce Link Layer Stats API
Change-Id: Ie3b3a1a511026aafbd46f8165272059ce856992d
2014-05-15 17:05:48 -07:00
Dmitry Shmidt
6b9d0da016 am 9595dc8c: am 4248e7c3: am a5b275c3: Merge "Changes to restart supplicant on crash"
* commit '9595dc8c8e07d40d606f11fedb7afb035bc87eb2':
  Changes to restart supplicant on crash
2014-05-15 16:32:02 +00:00
Dmitry Shmidt
9595dc8c8e am 4248e7c3: am a5b275c3: Merge "Changes to restart supplicant on crash"
* commit '4248e7c3cc06244b9d80a470e65dc95f862fccfa':
  Changes to restart supplicant on crash
2014-05-15 16:29:43 +00:00
Dmitry Shmidt
4248e7c3cc am a5b275c3: Merge "Changes to restart supplicant on crash"
* commit 'a5b275c3c64a718321f0731c49a338c6775f4273':
  Changes to restart supplicant on crash
2014-05-15 16:28:02 +00:00
Dmitry Shmidt
a5b275c3c6 Merge "Changes to restart supplicant on crash" 2014-05-15 16:25:01 +00:00
Mahesh
ff6902dc4f 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
2014-05-15 19:17:45 +05:30
Dmitry Shmidt
0eb0b4a31a 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.
2014-05-14 00:00:20 +00:00
Dmitry Shmidt
384bd5d631 am 7b11946c: am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
* commit '7b11946c48ebfab9b6a5d2c64366f19727d3a0af':
  Indicate WPA_EVENT_TERMINATING event on primary interface.
2014-05-13 23:53:15 +00:00
Dmitry Shmidt
7b11946c48 am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
* commit '9739aeb214087ef5dc0cfe7e4bd5f87904cefb92':
  Indicate WPA_EVENT_TERMINATING event on primary interface.
2014-05-13 23:48:32 +00:00
Dmitry Shmidt
9739aeb214 Merge "Indicate WPA_EVENT_TERMINATING event on primary interface." 2014-05-13 23:43:41 +00:00
Mahesh
0ef9a33a47 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
2014-05-13 14:12:05 +05:30
Eric Laurent
9c599afbc0 am 62038fc4: am 2c388a44: am 8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"
* commit '62038fc4c5c596f04a87388bb42bdef13d359c39':
  Audio: add an openOutputStreamWithFlags API
2014-05-08 18:24:06 +00:00
Vinit Deshapnde
5eabea5585 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
2014-05-07 19:23:27 -07:00
Vinit Deshapnde
b80d32d2a1 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
2014-05-07 18:51:12 -07:00
Eric Laurent
62038fc4c5 am 2c388a44: am 8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"
* commit '2c388a441da4a43904ac333a66bb3d5e26a8aa3a':
  Audio: add an openOutputStreamWithFlags API
2014-05-07 23:39:02 +00:00
Eric Laurent
2c388a441d am 8eb3354a: Merge "Audio: add an openOutputStreamWithFlags API"
* commit '8eb3354ad06cc4f24375d076698b35d2c26f0e90':
  Audio: add an openOutputStreamWithFlags API
2014-05-07 23:36:36 +00:00
Eric Laurent
8eb3354ad0 Merge "Audio: add an openOutputStreamWithFlags API" 2014-05-07 23:34:19 +00:00
Paul McLean
6616643121 Merge "Update policy handling for USB inputs" 2014-04-30 15:26:04 +00:00
Bill Yi
d848b9d317 am 7ba0162d: am af477302: Merge commit \'50a76b9727c876405e59d61e082b4be0abebab4b\' into HEAD
* commit '7ba0162d5af92e0fc46c73fc42aed6cd2cf929d7':
2014-04-30 12:50:29 +00:00
Bill Yi
7ba0162d5a am af477302: Merge commit \'50a76b9727c876405e59d61e082b4be0abebab4b\' into HEAD
* commit 'af4773020afdfe1ba2344f785416756e769ce1dc':
2014-04-30 00:59:07 +00:00
Bill Yi
af4773020a Merge commit '50a76b9727c876405e59d61e082b4be0abebab4b' into HEAD 2014-04-29 11:34:21 -07:00
Paul McLean
fd61179b64 Update policy handling for USB inputs
Change-Id: Ib2e531f115f8bd1d5f290094032f3f4a4753e726
2014-04-25 17:00:48 +00:00
Colin Cross
b10621c1f1 resolved conflicts for merge of 75402fdb to master
Change-Id: Ie85a3c7d498d7685738190267916e9a205cc469e
2014-04-24 08:39:41 -07:00
Colin Cross
75402fdbdd am 64527db9: Merge "audio: allow compiling for 64-bit"
* commit '64527db9b27d5f36412fefcd07c7054277ecf6c7':
  audio: allow compiling for 64-bit
2014-04-24 08:58:31 +00:00
Colin Cross
64527db9b2 Merge "audio: allow compiling for 64-bit" 2014-04-23 22:04:45 +00:00
David Wagner
cc029e59f7 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>
2014-04-23 14:42:21 +02:00
Colin Cross
c7b6e3c857 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
2014-04-18 15:48:06 -07:00