OSDN Git Service
Irfan Sheriff [Fri, 12 Oct 2012 19:02:04 +0000 (12:02 -0700)]
am
c4c58b24: Merge "Fix native crash" into jb-mr1-dev
* commit '
c4c58b249e02c944f05107398f1d32e3c41e28d1':
Fix native crash
Irfan Sheriff [Fri, 12 Oct 2012 18:58:01 +0000 (11:58 -0700)]
Merge "Fix native crash" into jb-mr1-dev
The Android Open Source Project [Fri, 12 Oct 2012 14:31:19 +0000 (07:31 -0700)]
Reconcile with jb-mr1-factory-release - do not merge
Change-Id: Id7a41d6b5c55960694407d194c496766eaefb5d2
Irfan Sheriff [Wed, 10 Oct 2012 22:41:13 +0000 (15:41 -0700)]
Fix native crash
Bug:
6404766
Change-Id: I8d2199fe2f4d48840a237b1ec2d085fe40c06517
The Android Automerger [Thu, 11 Oct 2012 15:19:21 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:05:21 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ibad2e367e7b86df59e5be5c5db6f2165f07fadb9
The Android Automerger [Thu, 11 Oct 2012 14:03:54 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Wed, 10 Oct 2012 23:36:08 +0000 (16:36 -0700)]
am
abc55c69: AudioPolicyManager supports querying active record sources
* commit '
abc55c698301e05a80d7f9394c75abca0b307602':
AudioPolicyManager supports querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 19:39:04 +0000 (12:39 -0700)]
AudioPolicyManager supports querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug
7314859
Change-Id: I8894845b176241134870af5df2bebc5ef27e4de4
The Android Open Source Project [Wed, 10 Oct 2012 16:45:02 +0000 (09:45 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I7ba72441de3b5c1aa8264e079a2808450036380a
The Android Automerger [Wed, 10 Oct 2012 15:55:57 +0000 (08:55 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:23 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Mon, 8 Oct 2012 22:53:09 +0000 (15:53 -0700)]
audio policy: add forced uses for system
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService by means of new forced use type
AUDIO_POLICY_FORCE_FOR_SYSTEM with config
AUDIO_POLICY_FORCE_SYSTEM_ENFORCED.
Property ro.camera.sound.forced is not used anymore.
Bug
7032634.
Change-Id: I742b0eebbe6b013f61d199846454a06411b52bc8
Mathias Agopian [Mon, 1 Oct 2012 21:53:18 +0000 (14:53 -0700)]
fix a typo in uevent_next_eventi
Bug:
7114973
Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2
Eric Laurent [Thu, 27 Sep 2012 01:50:09 +0000 (18:50 -0700)]
audio policy: force device update if disconnected
Force the new device selection to be applied when a device is disconnected
even if none is select. This is to indicate to the audio HAL that current
device selection is not valid anymore even if no new device is selected because
no audio track is active.
Bug
7141149.
Change-Id: Iade02fb53a4cc2051fce9da07870c5391396b696
Eric Laurent [Tue, 25 Sep 2012 23:52:22 +0000 (16:52 -0700)]
audio policy: fix crash when closing HDMI output
When a direct output is closed, the vector containing
the previously opened outputs must also be updated.
Bug
7157451.
Change-Id: I575b1f4928cf7527a4a98632fdec7600664a1e1c
Jean-Baptiste Queru [Thu, 20 Sep 2012 23:17:28 +0000 (16:17 -0700)]
am
e0232039: Merge "Restore the ability to use ctrl_interface directory"
* commit '
e0232039e0a59f7ef4fc67dad178387b2d5fffba':
Restore the ability to use ctrl_interface directory
Jean-Baptiste Queru [Thu, 20 Sep 2012 22:51:37 +0000 (15:51 -0700)]
Merge "Restore the ability to use ctrl_interface directory"
Jean-Michel Trivi [Mon, 17 Sep 2012 20:40:35 +0000 (13:40 -0700)]
Support audio recording while remote submix is active
When evaluating if an audio record is active, do not count inputs
opened on "virtual" devices, such as remote submix, as active.
Change-Id: If19c321cf673e3bdf4c3f81e73c163190df7c21e
Eric Laurent [Tue, 28 Aug 2012 21:32:21 +0000 (14:32 -0700)]
audio: new audio devices enums
Changes for new audio devices enums:
- legacy audio HAL wrapper provides conversion between new and
old device enums. It exposes a rev 2.0 audio device API to the
audio framework and allow legacy implementation to use old device enums.
- AudioPolicyManager: use standard enum value for no device (0).
Change-Id: I855d72291d672cdd8a6641bedb228634a54b7d9d
Jean-Michel Trivi [Mon, 20 Aug 2012 21:40:08 +0000 (14:40 -0700)]
Update Audio Policy Manager for remote submix
Define a new forced mode to route media to remote submix.
Update media routing rules according to mode.
Modify device connection management for remote submix.
Note that this CL doesn't implement changes to not prevent audio
recording when WFD is on, as audio recording is currently limited
to one input.
Change-Id: I458fe1802705da2d091ff82e536dc3e7f092f291
Eric Laurent [Thu, 6 Sep 2012 01:13:06 +0000 (18:13 -0700)]
audio policy: fix ringtone volume on headphones
When limiting ringtone volume because headphones are connected
and music is playing, the volume was not limited against the right
music volume. The is because the device used for music (headphone)
is not the same as the one used for ringtone (headphone + speaker).
Bug
6816207.
Change-Id: I3342be1789a1b7c58705812335b788f030bc6d76
Jean-Michel Trivi [Fri, 24 Aug 2012 18:45:04 +0000 (11:45 -0700)]
Update AudioPolicyManagerBase to only use audio_devices_t
The AudioPolicyManagerBase implementation was using some device
enum values from AudioSystemLegacy.h, of type audio_devices,
and some from /system/audio.h, of type audio_devices_t.
Now only uses audio_devices_t, and associated functions to
inspect what audio device type they correspond to.
Added #define to represent "no audio device" to clarify code.
Removed unused variable in AudioPolicyManagerBase::startOutput()
Change-Id: Ibec311dac550d6a806397377206a43bc708914c0
Paul Drews [Tue, 24 Jul 2012 23:17:53 +0000 (16:17 -0700)]
Restore the ability to use ctrl_interface directory
lihardware_legacy was ALWAYS re-writing the
wpa_supplicant.conf file's "ctrl_interface" entry to the
value specified as the property wifi.interface, whose value
was typically "wlan0". This was designed to allow the
wpa_supplicant service to be started with a "socket"
directive in its service description in an init.rc file.
Under these circumstances, the socket name is exchanged
between wpa_supplicant and its WifiService client through an
environment variable whose name is derived from
wifi.interface and a standard prefix.
However, since the "ctrl_interface" entry was always
re-written in this way, it broke the ability to use
"ctrl_interface" in its standard usage as a directory where
the (unix-domain) socket will be exchanged.
This change restores the ability to use the standard
directory-form ctrl_interface usage by limiting the
re-writing of the ctrl_interface entry to cases where it
does not look like an absolute path or the "DIR=" form of
directory.
Change-Id: I96c8656d144c1ea41e25ab0eb0807f7b49193b49
Signed-off-by: Paul Drews <paul.drews@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Jean-Michel Trivi [Tue, 21 Aug 2012 00:02:39 +0000 (17:02 -0700)]
Remove unused member variables in AudioPolicyManagerBase
The fields for the lists of input and output IOProfile are
not used in the AudioPolicyManagerBase class. Those are
actually stored inside each HwModule instance.
Change-Id: Iebb9fa5b7599a74013fd785a87de692890a89758
Glenn Kasten [Tue, 24 Jul 2012 14:51:26 +0000 (07:51 -0700)]
effect_descriptor_t const correctness
Change-Id: I734155d4cebb22b180f25290332c7c48be1e2b36
Glenn Kasten [Tue, 26 Jun 2012 00:28:38 +0000 (17:28 -0700)]
Merge "Use audio_channel_mask_t consistently"
Eric Laurent [Thu, 21 Jun 2012 16:55:49 +0000 (09:55 -0700)]
audio policy: fix HDMI hot plug
When an HDMI sink is connected it is possible that
a direct output is made available for multichannel audio.
In this case, the list of outputs available to reach the HDMI device
after the connection is different from before. checkOutputForStrategy()
must take this into account in order to invalidate tracks so that
they can be re connected to the multi channel output if necessary.
Change-Id: Id0baeb51688eba8017fe96bf92aaac52eb8e0f59
Glenn Kasten [Tue, 19 Jun 2012 19:29:39 +0000 (12:29 -0700)]
Use audio_channel_mask_t consistently
Change-Id: I0a274ab9f30a9380bc00eae69988224721fea177
The Android Open Source Project [Tue, 19 Jun 2012 13:13:45 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I2c7b504ccf7c3d9f7d0b17824f228c1a9ed87a0d
Eric Laurent [Wed, 13 Jun 2012 22:19:32 +0000 (15:19 -0700)]
audio policy: fix volume upon A2DP connection
setForceUse() should not force new device selection on outputs
if the selected device is 0. If a device 0 (no device) selection
is forced on a duplicated output, this causes volumes to be reset to
their default on outputs the duplicated output is connected to.
Also force reapply volumes when a new output is created. It is safer and more
explicit than relying on the fact that the selected volume is different
from default volume and thus is actually sent to audioflinger.
Bug
6658021.
Change-Id: I0a14d5229847e001b0d44f60d41c241efdb9946a
Eric Laurent [Thu, 14 Jun 2012 15:41:07 +0000 (08:41 -0700)]
am
4366b4a6: audio policy: fix volume upon A2DP connection
* commit '
4366b4a6735e5da342b56773073f0b41197c777f':
audio policy: fix volume upon A2DP connection
Eric Laurent [Wed, 13 Jun 2012 22:19:32 +0000 (15:19 -0700)]
audio policy: fix volume upon A2DP connection
setForceUse() should not force new device selection on outputs
if the selected device is 0. If a device 0 (no device) selection
is forced on a duplicated output, this causes volumes to be reset to
their default on outputs the duplicated output is connected to.
Also force reapply volumes when a new output is created. It is safer and more
explicit than relying on the fact that the selected volume is different
from default volume and thus is actually sent to audioflinger.
Bug
6658021.
Change-Id: I0a14d5229847e001b0d44f60d41c241efdb9946a
The Android Open Source Project [Mon, 11 Jun 2012 16:22:36 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: Ia53e5d26bd13718633bfe4931243ee2d9b1bdb6f
The Android Automerger [Fri, 8 Jun 2012 15:20:44 +0000 (08:20 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Michel Trivi [Thu, 7 Jun 2012 23:34:37 +0000 (16:34 -0700)]
am
e3ce4e99: Merge "Increase system stream volume on speaker" into jb-dev
* commit '
e3ce4e99970bd2820f91345b769e6f57353e02f0':
Increase system stream volume on speaker
Jean-Michel Trivi [Thu, 7 Jun 2012 22:29:09 +0000 (15:29 -0700)]
Merge "Increase system stream volume on speaker" into jb-dev
Eric Laurent [Thu, 7 Jun 2012 16:12:34 +0000 (09:12 -0700)]
am
5568b826: Merge "audio policy: fix notification volume limitation" into jb-dev
* commit '
5568b826b6b9b084f76b777db8b0411c7565e870':
audio policy: fix notification volume limitation
Eric Laurent [Thu, 7 Jun 2012 16:12:33 +0000 (09:12 -0700)]
am
fa3697d7: audio policy: remove delay when enabling speaker
* commit '
fa3697d716b444bbea6be480801536c44bf69214':
audio policy: remove delay when enabling speaker
Eric Laurent [Thu, 7 Jun 2012 16:10:26 +0000 (09:10 -0700)]
Merge "audio policy: fix notification volume limitation" into jb-dev
The Android Open Source Project [Thu, 7 Jun 2012 14:51:02 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: Iee868b6fbd8dda16cb70e4ea22d5a49ee927f3ce
Eric Laurent [Thu, 7 Jun 2012 00:39:16 +0000 (17:39 -0700)]
audio policy: fix notification volume limitation
The limitation of notification volume when playing music over headphones
has been broken for devices where notifications and music are played over
separate output streams.
Fix computeVolume() to check music stream activity on all outputs.
Bug
6623707.
Change-Id: Ie25f9b428ea086efe0be5fea2d31551d2528b655
Eric Laurent [Wed, 6 Jun 2012 23:09:03 +0000 (16:09 -0700)]
audio policy: remove delay when enabling speaker
Do not force mute on a strategy when moving it from one output
stream to another if no stream is active.
Bug
6611972.
Change-Id: I21f72b0ef3600639de66e6b0a1c3ae44045fd81f
The Android Automerger [Wed, 6 Jun 2012 14:02:52 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Michel Trivi [Tue, 5 Jun 2012 18:35:24 +0000 (11:35 -0700)]
Increase system stream volume on speaker
Increase the volume of the system stream for speaker output, so
sounds played on this stream can be louder on devices that
need it.
Additional changes in the rest of the framework will define properties
to tune sound effect levels on a per-device basis.
Bug
6448481
Change-Id: Ia6c1ff314a321c6e271a682e3f4ff64c250b184e
Eric Laurent [Tue, 5 Jun 2012 16:34:09 +0000 (09:34 -0700)]
am
3cdfddf1: audio policy: improve support for direct outputs
* commit '
3cdfddf1b27bcb5408ca3a04fcdf206447ba07ba':
audio policy: improve support for direct outputs
Eric Laurent [Tue, 1 May 2012 01:28:24 +0000 (18:28 -0700)]
audio policy: improve support for direct outputs
Add the capability to query supported parameters for
direct outputs after a device is connected. This allows
to dynamically update the output profile for devices like
HDMI where the capabilities depend on the connected sink.
Also added very verbose log mode for volume and mute.
Change-Id: I1d4ba8e7dbc3e1af883582857ce93240441e551c
The Android Automerger [Sun, 3 Jun 2012 13:03:23 +0000 (06:03 -0700)]
merge in jb-release history after reset to jb-dev
Marco Nelissen [Sat, 2 Jun 2012 02:00:32 +0000 (19:00 -0700)]
am
46604553: Ensure global effects are on the correct output
* commit '
4660455366d2ee64cb65f0ecd6f7ddeb1c17bac6':
Ensure global effects are on the correct output
Marco Nelissen [Thu, 31 May 2012 17:50:29 +0000 (10:50 -0700)]
Ensure global effects are on the correct output
Global effects such as the visualizer would sometimes not be on the
right output, for example when switching from a2dp to wired headset
or back, when there are both regular and deep buffer outputs available.
We now check which of the available outputs the global effect should
be on when more than one is available.
b/
6528772
Change-Id: Ie268e32ef41e7888da67c24730dc93750a2cf579
The Android Open Source Project [Tue, 29 May 2012 16:41:03 +0000 (09:41 -0700)]
Reconcile with jb-release
Change-Id: Ib51f8d004df9740327110e2dfd9a3be26cee5800
The Android Automerger [Tue, 29 May 2012 15:58:27 +0000 (08:58 -0700)]
merge in jb-release history after reset to jb-dev
Eric Laurent [Thu, 24 May 2012 18:42:55 +0000 (11:42 -0700)]
am
1afd84f6: audio policy: allow disabling A2DP for media.
* commit '
1afd84f62291d20414cbf58c7af01462a8fdca60':
audio policy: allow disabling A2DP for media.
The Android Open Source Project [Tue, 22 May 2012 20:06:36 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: Idddf82739bdf873cc163171dd5469f017f7d07a6
Eric Laurent [Mon, 21 May 2012 15:50:50 +0000 (08:50 -0700)]
audio policy: allow disabling A2DP for media.
Added FORCE_NO_BT_A2DP forced use to allow applications to
override default policy to use A2DP whenever connected.
Bug
6485897.
Change-Id: I784271c062294fbe1aff7884965075b40c68dc24
The Android Automerger [Sun, 20 May 2012 14:39:47 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
Eric Laurent [Fri, 18 May 2012 02:09:21 +0000 (19:09 -0700)]
am
01e6272f: audio policy: fix in call volume problem.
* commit '
01e6272f0a3a7d1d53e826012377ff9269b03b06':
audio policy: fix in call volume problem.
The Android Open Source Project [Wed, 16 May 2012 15:40:49 +0000 (08:40 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I4d5083c87b3e9fc0bc5168dca5328db64ee5b936
Eric Laurent [Wed, 16 May 2012 02:16:30 +0000 (19:16 -0700)]
audio policy: fix in call volume problem.
When switching audio path, it is sometimes required
to temporarily mute certain streams to avoid glitches.
The unmute command is sent with a delay but the volume applied
when unmuting is computed according to the state at the time of mute.
If the device selection changes after the delayed unmute is programmed
the new volume will not correspond to the new device.
setStreamMute() now accepts a device selection as input parameter which is
used instead of current device for volume computation.
Bug
6497819.
Change-Id: I355ebf9e1afe814fa5c2723bda9c40e58f921b46
The Android Automerger [Mon, 14 May 2012 14:03:47 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Sat, 12 May 2012 00:40:45 +0000 (17:40 -0700)]
Delete unused function.
set_last_user_activity_timeout() is no longer used or useful.
It opens a sysfs node that no longer exists that used to
be published by a daemon that is no longer even compiled
and that is about to be deleted. It used to be called
by the power manager with a huge value whose purpose was
essentially to disable the timeout feature altogether.
Long live dead code!
Bug:
6435382
Change-Id: If8f97a66f4e963a11e1c6b67ad97b41b2613043e
Eric Laurent [Thu, 10 May 2012 17:12:19 +0000 (10:12 -0700)]
Reduce system stream volume.
Reduce system stream volume by 6dB as
UI sounds are now perceived as being too loud.
Issue
6448481.
Change-Id: I0237eb94245014724dfdf55253049340e2162af8
The Android Automerger [Mon, 30 Apr 2012 14:03:22 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Eric Laurent [Wed, 25 Apr 2012 22:47:56 +0000 (15:47 -0700)]
system and UI sounds volume policy
Added specific volume curves for AUDIO_STREAM_SYSTEM,
AUDIO_STREAM_ENFORCED_AUDIBLE and AUDIO_STREAM_DTMF.
Volume for these streams tracks AUDIO_STREAM_RING on phones
and AUDIO_STREAM_MUSIC on tablets but is contrained in the range
-24dB to -6dB on speaker and -24dB to -12dB on headset.
STRATEGY_ENFORCED_AUDIBLE routing policy is now the same as
STRATEGY_MEDIA in countries where not enforced.
Change-Id: If58d96559bfe2bbff4cd94c631d5933bd940778e
The Android Automerger [Wed, 25 Apr 2012 14:48:27 +0000 (07:48 -0700)]
merge in jb-release history after reset to jb-dev
Dima Zavin [Tue, 24 Apr 2012 07:21:59 +0000 (00:21 -0700)]
audio_policy: set some reasonable defaults if audio_policy.conf is not found
Change-Id: I25f7407c34b3032d4e77a27a4ac47b648098d9b0
Signed-off-by: Dima Zavin <dima@android.com>
The Android Automerger [Tue, 24 Apr 2012 14:03:27 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Dima Zavin [Mon, 23 Apr 2012 23:51:00 +0000 (16:51 -0700)]
audio_policy: look for config file in /vendor first
Change-Id: If10308f688437e1682e4104120772cfce16e9d89
Signed-off-by: Dima Zavin <dima@android.com>
Eric Laurent [Sun, 22 Apr 2012 20:57:53 +0000 (13:57 -0700)]
audio policy: volume burst when switching device
The addition of the per device volume feature has introduced
a problem where a volume burst can be heard in the headphones
just after insertion if the speaker volume is much higher than the
headphones volume.
Added a temporary mute of the output when switching device to force
volume ramp to 0 and back up to new volume.
Issue
5984108.
Change-Id: I5c9ffbbcadd12d25c78cc2614d351346b8186c55
The Android Automerger [Mon, 23 Apr 2012 14:04:26 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Sat, 14 Apr 2012 01:48:06 +0000 (18:48 -0700)]
audio policy: add support for deep audio buffers
Added definitions for parsing deep buffer flags in output profiles.
Make sure that sound start is delayed enough to allow
duck/mute effect to apply before starting a notification on an output
with lower latency.
Change-Id: I1578e245da19d1a0f9ec62a2ea6dddaf82ea282b
The Android Automerger [Thu, 19 Apr 2012 14:03:25 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Wed, 18 Apr 2012 16:28:52 +0000 (09:28 -0700)]
rename audio policy flags
Change-Id: Ic42eba3432671f651c9703a07fe7b429a8ec0dff
The Android Automerger [Wed, 18 Apr 2012 14:03:37 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Sat, 14 Apr 2012 01:49:20 +0000 (18:49 -0700)]
audio: update to new audio HAL device API.
Change-Id: I27c5e1e1041f62530884ec5d929e7d82f091912a
The Android Automerger [Tue, 10 Apr 2012 14:04:22 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
The Android Automerger [Mon, 9 Apr 2012 14:04:36 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Fri, 6 Apr 2012 16:07:07 +0000 (09:07 -0700)]
audio policy: added rules for USB audio devices
Change-Id: If712b0c7fcf281d66d34614529f3433e56e058fb
Jean-Michel Trivi [Thu, 5 Apr 2012 18:44:49 +0000 (11:44 -0700)]
Allow non-direct output of any channel mask
Because of the downmix capability of the mixer, do not prevent
a non-direct output to be retrieved based on channel mask.
Change-Id: I911f95f4055c2134298c233d14f2f5d586091fd4
The Android Automerger [Thu, 5 Apr 2012 14:04:16 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
The Android Automerger [Wed, 4 Apr 2012 14:04:42 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Wed, 28 Mar 2012 18:27:13 +0000 (11:27 -0700)]
audio policy: load audio hw modules
Audio hw modules are now loaded according to configuration
data read from audio_policy.conf. They are not loaded anymore
from a hardcoded list in AudiFlinger.
Output and input streams are opened on the hw module by which
they are exposed.
Also removed obsolete "acoustics" flags for input streams.
Change-Id: I8dc658cc83890d3ac7d5e36c372a03732aa5b0c4
Eric Laurent [Tue, 20 Mar 2012 20:44:51 +0000 (13:44 -0700)]
audio policy: use configuration file
The audio policy manager implementation now reads a configuration file at
boot time that contains descriptors for available audio hardware
modules and for each module the profiles of available inputs and outputs streams.
The configuration file path on the target is: /system/etc/audio_policy.conf.
A default configuration file is given that defines a basic configuration
with one primary audio hw module capable of playback and capture.
Each platform or device should have its own audio_policy.conf file.
Also removed default value of fromCache argument of getDeviceForStrategy()
and getNewDevice() methods.
Change-Id: I0c773d2331508bbc787f89b123dd6a7b8c10d459
The Android Automerger [Tue, 3 Apr 2012 10:32:27 +0000 (03:32 -0700)]
merge in jb-release history after reset to master
Jean-Michel Trivi [Thu, 15 Mar 2012 16:33:34 +0000 (09:33 -0700)]
Only duplicate notifications when no media is playing
Map the NOTIFICATION stream type to a new strategy,
named STRATEGY_NOTIFICATION_RESPECTFUL, which differs
from STRATEGY_NOTIFICATION in that, when media is
playing, the notifications will use the same output
as the MEDIA strategy. This will results in the
notifications not being duplicated on the speaker
when a headset is in use for media playback.
Change-Id: I032be0e2d383c69b5b6c912d7174753f5572c4b4
The Android Automerger [Mon, 26 Mar 2012 14:04:56 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Mike Lockwood [Thu, 22 Mar 2012 00:44:34 +0000 (17:44 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
empty merge -s ours
Change-Id: I11a8a28ffccb4d28f2bbed4d55919443cae24e9f
Mike Lockwood [Thu, 22 Mar 2012 00:43:54 +0000 (17:43 -0700)]
Merge commit '
5b71e6f'
Add an implementation of get_next_write_timestamp.
Change-Id: Ie8e19307bafdb057d06bf3c536380c5740f830a6
Mike Lockwood [Thu, 22 Mar 2012 00:42:25 +0000 (17:42 -0700)]
Merge commit '
617c80a'
Add a bridge implementation of get_master_volume.
Conflicts:
audio/audio_hw_hal.cpp
Change-Id: Icff9d8dce05d1d811fca815cc39cb38a1df293f9
The Android Automerger [Wed, 21 Mar 2012 14:03:45 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Tue, 20 Mar 2012 00:31:15 +0000 (17:31 -0700)]
Remove obsolete references to libmedia
Change-Id: I65c10c2c6248a439d8ba6b3e9d540072fb25039f
The Android Automerger [Mon, 19 Mar 2012 14:03:48 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Fri, 16 Mar 2012 17:36:22 +0000 (10:36 -0700)]
Merge "Add libmedia_native"
Kenny Root [Thu, 15 Mar 2012 20:10:19 +0000 (13:10 -0700)]
Add support for EINTR to wifi.c
Some system calls can be interrupted. wifi.c in particular was getting
into error conditions during bugreport because it doesn't handle EINTR
at all.
Change-Id: I7bec432a0b3dca7dcc5c03c5e9f5e9ed73fa3c4b
Glenn Kasten [Thu, 15 Mar 2012 16:45:04 +0000 (09:45 -0700)]
Add libmedia_native
Change-Id: I1d66327828a5adb06911de1f72076bc0295255c1
The Android Automerger [Mon, 12 Mar 2012 14:03:51 +0000 (07:03 -0700)]
merge in jb-release history after reset to master
Eric Laurent [Thu, 8 Mar 2012 21:39:13 +0000 (13:39 -0800)]
audio policy: use audio_devices_t when appropriate
Change-Id: I0b4e2ff705fce96b40fdda28b1bc4b514438bec6
Eric Laurent [Thu, 8 Mar 2012 03:19:29 +0000 (19:19 -0800)]
audio policy: spaced comments in header file
Change-Id: Ie72dcb9e33afb217bb7e37081500a7fc53d7a047
Eric Laurent [Thu, 8 Mar 2012 03:04:55 +0000 (19:04 -0800)]
audio policy: use common string for A2DP address
Use definition from audio.h for A2DP sink address parameter.
Change-Id: I2d7905b8e3dd71fab2efc68ae16682e09c3f872e