Commit graph

321 commits

Author SHA1 Message Date
The Android Automerger
262cb50463 merge in ics-release history after reset to master 2011-09-20 07:00:24 -07:00
Irfan Sheriff
025321a09d Add support to terminate monitor thread
Create a local pipe to track when socket connection times out
and send a terminate on the monitor thread

Bug: 5337272
Change-Id: I80ed3f8450b4d54d1b9e2bbc3cc84f10d0ae7a04
2011-09-19 16:52:32 -07:00
The Android Automerger
9e0d7cd89d merge in ics-release history after reset to master 2011-09-13 06:34:14 -07:00
Eric Laurent
f19b955727 am cd057ad2: Issue 5256795: Phone ringtone volume is too low
* commit 'cd057ad2774903c62f5c11bc71c4e7357aee71b8':
  Issue 5256795: Phone ringtone volume is too low
2011-09-12 17:04:11 -07:00
Eric Laurent
cd057ad277 Issue 5256795: Phone ringtone volume is too low
Modified the volume curve for ringtones and notifications
in audio policy manager. The first volume step now corresponds to
-30dB instead of -50dB thus making ringtone much more
audible for low volume settings.

Also made a generic implementation of volume curves according to
audio policy strategies.

Change-Id: Ieb7916ba2e53c2a10a47efec82814cabed21c48b
2011-09-12 17:01:15 -07:00
Eric Laurent
c1f5f18328 am fd6aba42: Merge "audio policy manager: invert SPDIF/HDMI priority"
* commit 'fd6aba424765b2856c0b78135ce15d1bd7508948':
  audio policy manager: invert SPDIF/HDMI priority
2011-09-12 13:43:27 -07:00
Eric Laurent
fd6aba4247 Merge "audio policy manager: invert SPDIF/HDMI priority" 2011-09-12 13:42:00 -07:00
Eric Laurent
55ac23bc11 audio policy manager: invert SPDIF/HDMI priority
Route media audio in priority to S/PDIF output when available
even if HDMI is connected. This allows users to chose to output audio
to a different system than the display.

Also force media volume to max when playing over S/PDIF.

Change-Id: I03b82a7235cb60f2b5d6cf7923570554b07ac400
2011-09-12 12:40:35 -07:00
The Android Automerger
4fda210bbb merge in ics-release history after reset to master 2011-09-11 06:41:55 -07:00
Erik Gilling
cbff628806 am 020418ec: uevent: add helper to get uevent FD
* commit '020418ec646f989ca14f26e3abd8f23208e9cd4d':
  uevent: add helper to get uevent FD
2011-09-09 14:06:32 -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
John Grossman
e14fb4f6fb Add an implementation of get_next_write_timestamp.
Add a default implementation of get_next_write_timestamp to the C <--> C++
legacy audio HAL implementation allowing HALs using the legacy C++
AudioStreamOut to overload and implement get_next_write_timestamp.  Default
implementation returns INVALID_OPERATION to indicate that the functionality is
not supported.

Change-Id: I2f32858197696cb46ba6b96f30acc08e0b737a3f
2011-08-31 11:49:34 -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
a6fa57f7ef am 67ba2276: Add support seperate p2p config file
* commit '67ba2276b9a5232685e14d416fea0b1250515594':
  Add support seperate p2p config file
2011-08-29 16:32:52 -07:00
John Grossman
5be2265e30 Add a bridge implementation of get_master_volume.
Add an implementation of the new get_master_volume method to bridge from the new
C only audio HAL to the old C++ legacy audio HAL.

Change-Id: Ib66bdcd3bee50949047e7ad51388e15491a71724
2011-08-26 16:54:09 -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