The Android Automerger
4fda210bbb
merge in ics-release history after reset to master
2011-09-11 06:41:55 -07:00
Erik Gilling
020418ec64
uevent: add helper to get uevent FD
...
This allows users of the library to handle thier own poll loop.
Change-Id: Id3fe2be442c0ca29c74253f9f36e9377278780e4
Signed-off-by: Erik Gilling <konkers@android.com>
2011-09-08 16:30:33 -07:00
The Android Automerger
512e0e89c9
merge in ics-release history after reset to master
2011-08-30 13:42:49 -07:00
The Android Automerger
2f3aa31fa2
merge in ics-release history after reset to master
2011-08-30 12:45:42 -07:00
Irfan Sheriff
67ba2276b9
Add support seperate p2p config file
...
Also, fixed a bug with config overwrite with ctrl_interface update
Bug: 5002384
Change-Id: I870c12ee58d60f696512c27deb4b9d35b4dc3b2a
2011-08-26 14:39:38 -07:00
Dmitry Shmidt
953c114065
wifi: Increase wait for card removal
...
Change-Id: Ia9f5bf2a905c89126535a6c01c3af67189df6c32
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-23 15:44:23 -07:00
Irfan Sheriff
5a8a2d2b13
Fix system property race at supplicant stop
...
We stop supplicant by sending a "terminate" control command. init then
updates the system property init.svc.wpa_supplicant when the supplicant has stopped. The
framework gets notified of a successful supplicant stop through a supplicant event.
It can happen that the framework has been notified of a supplicant stop, but the init
process has not set the system property and thus when the framework tries to connect
to the supplicant again, it can immediately return saying the supplicant is already running.
Avoid this race, by ensuring the call from framework to close supplicant connection polls
for the update by init process that the system property indicates supplicant has stopped.
Bug: 5166494
Change-Id: Ie74a8cf39fa56ae557ea6bbbcba7865301620c42
2011-08-22 13:35:48 -07:00
Dmitry Shmidt
841667015b
Merge "wifi: Wait for sdio card removal"
2011-08-12 14:05:23 -07:00
Dmitry Shmidt
1881331298
wifi: Wait for sdio card removal
...
Change-Id: I3fdbd27e45536b9142e0ca88692270bac543177a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-12 12:14:15 -07:00
Eric Laurent
582a15744b
AudioPolicyManager: register effect CPU on enable
...
Audio effect CPU usage is now registered on enable and
unregistered on disable instead of when the effect is
created or destroyed.
Change-Id: Icffcede9558d8d41887278f0efef2df430927381
2011-08-11 09:17:07 -07:00
Vladimir Chtchetkine
33556654af
am f5498f29
: am 058c940a
: Merge "Enable QEMUD pipe connection for all legacy hw-control clients"
...
* commit 'f5498f29d81f638e4d833d0399f80f379e721fbe':
Enable QEMUD pipe connection for all legacy hw-control clients
2011-08-10 12:25:01 -07:00
Vladimir Chtchetkine
f5498f29d8
am 058c940a
: Merge "Enable QEMUD pipe connection for all legacy hw-control clients"
...
* commit '058c940a88c1a28818daaed32fe86dfdc61929b6':
Enable QEMUD pipe connection for all legacy hw-control clients
2011-08-09 10:05:30 -07:00
Vladimir Chtchetkine
058c940a88
Merge "Enable QEMUD pipe connection for all legacy hw-control clients"
2011-08-08 12:59:34 -07:00
Vladimir Chtchetkine
2dbd8949b2
Enable QEMUD pipe connection for all legacy hw-control clients
...
Change-Id: Ic713d4cdcddb724958fc8c1c8a82a1dc2733da32
2011-08-04 13:57:57 -07:00
Jean-Michel Trivi
8e925841ab
Merge "Fix bug 4319552 Use commonly defined channel mask values"
2011-07-26 09:27:24 -07:00
Jean-Michel Trivi
20324efa14
Fix bug 4319552 Use commonly defined channel mask values
...
Use channel mask values that match OpenSL ES and other common APIs.
Change-Id: Ie7e62bf8e3565f4e4b1f17b6e525c490989c8d6c
2011-07-25 17:00:17 -07:00
Jean-Michel Trivi
77e130e18c
Merge "Fix bug 4211099 channel constants and 7.1 mask"
2011-07-25 16:59:36 -07:00
Jean-Michel Trivi
9b1b6064c1
Fix bug 4211099 channel constants and 7.1 mask
...
Add definitions for the side and elevated channels.
Correct definition of 7.1 mask which uses
the side channels rather than the front half-pan channels.
Change-Id: I8b75c6fb380fddc2db09fab53799850218940c93
2011-07-25 15:55:27 -07:00
Dmitry Shmidt
ea8ec41edf
Merge "wifi: Add entropy file support"
2011-07-25 14:45:28 -07:00
Dmitry Shmidt
3ab3e66967
wifi: Add entropy file support
...
Change-Id: Iee92ee9fee15037cffde86b9cd2c9407afb8d2ca
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-25 10:48:45 -07:00
Dmitry Shmidt
ebcaf07421
Merge "Fix incremental builds by adding Cleanspec step"
2011-07-24 16:52:26 -07:00
Dmitry Shmidt
9582057b29
Fix incremental builds by adding Cleanspec step
...
Change-Id: Ifb18c40c43668e985c56492956ceeff2e49e4c38
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-22 16:23:43 -07:00
Eric Laurent
8581dee749
Merge "Audio effects: support for audio pre processing"
2011-07-20 17:45:18 -07:00
Dmitry Shmidt
29a4d4d74b
wifi: Add wifi_change_fw_path()
...
Change-Id: I1c4afe43457a295c0ffe0a865c6c331109dce614
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-19 15:59:13 -07:00
Eric Laurent
1c65a49da0
Audio effects: support for audio pre processing
...
Audio policy manager: allow registration of audio effects on
inputs too.
Change-Id: I92efa5b51cfde591052a5c56ba2b0b84de80df0f
2011-07-12 17:19:08 -07:00
Jeff Brown
437fee8c60
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
2011-07-12 12:15:49 -07:00
Jeff Brown
5c3560571b
Remove the simulator target from all makefiles.
...
Bug: 5010576
Change-Id: I77e0620f7543926b5def7666c02d99565f6487ed
2011-07-11 22:12:24 -07:00
Eric Laurent
2d97c20601
Audio HAL: added interface for audio preprocessing
...
Change-Id: I0a84ddbff53f13662873f69d9be4dfa13ebcb8fe
2011-07-11 12:01:13 -07:00
Dmitry Shmidt
bdd1ef0af8
Fix incremental builds by adding Cleanspec step
...
Change-Id: Ia51da716a6d5ede2ea802881e77cb69d3e6a3ed6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-08 16:51:48 -07:00
Dmitry Shmidt
4b7ffa08be
wifi: Add wifi_get_fw_path() call
...
Change-Id: Ib9dc8ce84febb2fba045ee527838653d0d1ad11b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-07-01 11:03:43 -07:00
Dmitry Shmidt
d301cb7a5e
wifi: Assume built-in wlan driver if WIFI_DRIVER_MODULE_PATH is not set
...
Change-Id: Ic63381fe037cd5aa1f3d419d7c253c2b17961a24
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-06-29 16:22:28 -07:00
Dima Zavin
d17f66f332
audio: update for audio/audio_policy header names/locations
...
Change-Id: I7a414a2e173c2bfd72ae70d57b251fa0d4dbdfa0
Signed-off-by: Dima Zavin <dima@android.com>
2011-06-13 18:18:55 -07:00
Dmitry Shmidt
4c1a1fedd6
wifi: Allow to finish interface down
...
Change-Id: I249646845f0837c7cbf6c118d08aecb5b3ccaba5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-06-13 10:32:08 -07:00
Dima Zavin
4a0748be28
update for new audio.h header location
...
Change-Id: Ia0859cc22cfd50a334235aac5b1e8688bc3d52f4
Signed-off-by: Dima Zavin <dima@android.com>
2011-05-11 14:16:14 -07:00
Dima Zavin
d8d8c60a3a
hardware_legacy/audio: provide a default audio policy implementation
...
This uses the legacy policy code to build a default implementation that
can be used while we figure out what the new policy inheritance should
look like.
Change-Id: I3e4154abc7152b4f560b28e391a268bf508767e3
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:25 -07:00
Dima Zavin
b7e1f72899
legacy: build legacy audio wrapper libs
...
Note that the legacy audio helper libs are not part of the
main libhardware_legacy lib itself.
Change-Id: Ie08343ab8de2d298db0041c711d7e02a284bc4c3
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:25 -07:00
Dima Zavin
e81531e91e
hardware_legacy: provide HAL helpers for legacy audio users
...
This doesn't actually create a HAL, but rather a set of helper static
libraries that device specific libraries (i.e. the old libaudio pieces)
can link against to create a proper audio HAL module.
We provide an audio_policy static wrapper and audio hardware interface
static wrapper.
Change-Id: Ie56195447ad24b83888f752dca24674b0afd8a76
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:25 -07:00
Dima Zavin
f01215993d
legacy: move legacy audio code from frameworks/base here
...
Change-Id: Ic5da0130af44354dffdf85c30cd99f57c6ee163c
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:20 -07:00
Dima Zavin
2dad3e45a0
legacy: explicitly enumerate subdirs to include
...
Change-Id: I308d26d5f018eb4fb62a06eef6e6320b0d5aa7dc
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-20 14:42:47 -07:00
Dima Zavin
329eccd47f
legacy: also build a shared version of libpower
...
Change-Id: Ied33d3d8cdb17444d5ea367422b060490985e2b8
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-20 14:42:47 -07:00
Dima Zavin
1d10e7d480
legacy: don't link against libutils or libbinder
...
Change-Id: Ia8cd74ad9d7c6170fb0525b77e1443b7a8d39377
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-20 14:42:38 -07:00
Dmitry Shmidt
eea19f1d85
Move wpa_ctrl_cleanup() function to wifi_wpa_ctrl_cleanup()
...
Change-Id: I557a2ac10ebb226508ffccfbfeca7f326912ed04
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-25 13:37:18 -07:00
Eric Laurent
770062f225
am 37757062
: Improvement for issue 3489986: BT SCO volume
...
* commit '3775706211178bf0d252fd30b9ff1c00926c8535':
Improvement for issue 3489986: BT SCO volume
2011-03-15 23:54:38 -07:00
Eric Laurent
3775706211
Improvement for issue 3489986: BT SCO volume
...
Add a parameter to applyStreamVolumes() to force stream volume update.
Change-Id: I3cc82e516bb7c76c28c2470b06711c44f4789ce5
2011-03-15 14:33:07 -07:00
Dmitry Shmidt
89ae703cd6
wifi: Ensure RW for wpa_supplicant.conf
...
Change-Id: Icaeac0ee2239333be5f3be10024824ada6da18d5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-07 15:30:53 -08:00
Glenn Kasten
fafb18fb31
Bug 3352047 Wrong message when adjusting volume
...
Add hidden AudioManager.getDevicesForStream and output device codes.
Change-Id: I45be59a2774196a135d013e45f38033036f74257
2011-02-10 13:31:26 -08:00
Eric Laurent
793dd9f2be
am 01056fcf
: am 36291a74
: Fix issue 3371080.
...
* commit '01056fcfbbbb577f7d70324a4d6a3a211a519951':
Fix issue 3371080.
2011-02-03 17:18:49 -08:00
Eric Laurent
01056fcfbb
am 36291a74
: Fix issue 3371080.
...
* commit '36291a74cd212c4172ac054ad0eec686b7e15c96':
Fix issue 3371080.
2011-02-03 10:28:26 -08:00
Eric Laurent
36291a74cd
Fix issue 3371080.
...
Move isStreamActive() method from AudioFlinger to AudioPolicyManager.
iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.
Change-Id: Ib0d7d8f061b9f809d307ecfac40960ef582e5f0f
2011-02-02 15:33:42 -08:00
The Android Open Source Project
b6bb4031b5
am 5fc112b6
: Reconcile gingerbread-plus-aosp and honeycomb
...
* commit '5fc112b62e2cebc22c473ef33641457bada72545':
2011-01-30 12:54:43 -08:00