summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Valgrind found this Change-Id: I24c640c2b0b6cac129c23bfc18828aff005ec952
* | | | | Merge "Remote audio submix always has priority for media, only plays media" ↵Jean-Michel Trivi2012-10-152-6/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into jb-mr1-dev
| * | | | Remote audio submix always has priority for media, only plays mediaJean-Michel Trivi2012-10-112-6/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use force use mechanism for remote audio submix routing. Prevent streams of strategy sonification to be played over remote audio submix (e.g. WFD) and HDMI Bug 7318180 Change-Id: Ic5c87d3c568873dffea9002cf87ecf42b403cde6
* | | | Merge "Fix native crash" into jb-mr1-devIrfan Sheriff2012-10-121-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Fix native crashIrfan Sheriff2012-10-111-6/+6
| |/ / | | | | | | | | | | | | Bug: 6404766 Change-Id: I8d2199fe2f4d48840a237b1ec2d085fe40c06517
* | | AudioPolicyManager supports querying active record sourcesJean-Michel Trivi2012-10-104-0/+22
|/ / | | | | | | | | | | | | | | | | Add support for querying whether there is currently a recording underway from the specified audio source. Bug 7314859 Change-Id: I8894845b176241134870af5df2bebc5ef27e4de4
* | audio policy: add forced uses for systemEric Laurent2012-10-082-13/+20
|/ | | | | | | | | | | | | 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
* fix a typo in uevent_next_eventiMathias Agopian2012-10-011-1/+1
| | | | | Bug: 7114973 Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2
* audio policy: force device update if disconnectedEric Laurent2012-09-261-1/+4
| | | | | | | | | | | 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
* audio policy: fix crash when closing HDMI outputEric Laurent2012-09-251-0/+1
| | | | | | | | | When a direct output is closed, the vector containing the previously opened outputs must also be updated. Bug 7157451. Change-Id: I575b1f4928cf7527a4a98632fdec7600664a1e1c
* am e0232039: Merge "Restore the ability to use ctrl_interface directory"Jean-Baptiste Queru2012-09-201-1/+13
|\ | | | | | | | | * commit 'e0232039e0a59f7ef4fc67dad178387b2d5fffba': Restore the ability to use ctrl_interface directory
| * Merge "Restore the ability to use ctrl_interface directory"Jean-Baptiste Queru2012-09-201-1/+13
| |\
| | * Restore the ability to use ctrl_interface directoryPaul Drews2012-08-231-1/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Support audio recording while remote submix is activeJean-Michel Trivi2012-09-182-3/+22
| | | | | | | | | | | | | | 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
* | audio: new audio devices enumsEric Laurent2012-09-075-92/+180
| | | | | | | | | | | | | | | | | | | | 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
* | Update Audio Policy Manager for remote submixJean-Michel Trivi2012-09-073-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | audio policy: fix ringtone volume on headphonesEric Laurent2012-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | 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
* | Update AudioPolicyManagerBase to only use audio_devices_tJean-Michel Trivi2012-08-244-127/+135
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove unused member variables in AudioPolicyManagerBaseJean-Michel Trivi2012-08-201-2/+0
| | | | | | | | | | | | | | | | 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
* | effect_descriptor_t const correctnessGlenn Kasten2012-07-244-8/+8
| | | | | | | | Change-Id: I734155d4cebb22b180f25290332c7c48be1e2b36
* | Merge "Use audio_channel_mask_t consistently"Glenn Kasten2012-06-252-8/+8
|\ \
| * | Use audio_channel_mask_t consistentlyGlenn Kasten2012-06-192-8/+8
| |/ | | | | | | Change-Id: I0a274ab9f30a9380bc00eae69988224721fea177
* | audio policy: fix HDMI hot plugEric Laurent2012-06-212-21/+31
|/ | | | | | | | | | | 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
* Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ | | | | | | Change-Id: I2c7b504ccf7c3d9f7d0b17824f228c1a9ed87a0d
| * audio policy: fix volume upon A2DP connectionEric Laurent2012-06-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 4366b4a6: audio policy: fix volume upon A2DP connectionEric Laurent2012-06-141-4/+4
|\ \ | | | | | | | | | | | | * commit '4366b4a6735e5da342b56773073f0b41197c777f': audio policy: fix volume upon A2DP connection
| * | audio policy: fix volume upon A2DP connectionEric Laurent2012-06-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: Ia53e5d26bd13718633bfe4931243ee2d9b1bdb6f
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| |\ \ | | |/ | |/|
* | | am e3ce4e99: Merge "Increase system stream volume on speaker" into jb-devJean-Michel Trivi2012-06-071-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'e3ce4e99970bd2820f91345b769e6f57353e02f0': Increase system stream volume on speaker
| * | Merge "Increase system stream volume on speaker" into jb-devJean-Michel Trivi2012-06-071-2/+2
| |\ \
| | * | Increase system stream volume on speakerJean-Michel Trivi2012-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 5568b826: Merge "audio policy: fix notification volume limitation" into ↵Eric Laurent2012-06-071-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-dev * commit '5568b826b6b9b084f76b777db8b0411c7565e870': audio policy: fix notification volume limitation
| * | | Merge "audio policy: fix notification volume limitation" into jb-devEric Laurent2012-06-071-1/+2
| |\ \ \
| | * | | audio policy: fix notification volume limitationEric Laurent2012-06-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am fa3697d7: audio policy: remove delay when enabling speakerEric Laurent2012-06-071-2/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fa3697d716b444bbea6be480801536c44bf69214': audio policy: remove delay when enabling speaker
| * | | | audio policy: remove delay when enabling speakerEric Laurent2012-06-061-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Iee868b6fbd8dda16cb70e4ea22d5a49ee927f3ce
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 3cdfddf1: audio policy: improve support for direct outputsEric Laurent2012-06-053-153/+302
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3cdfddf1b27bcb5408ca3a04fcdf206447ba07ba': audio policy: improve support for direct outputs
| * | | audio policy: improve support for direct outputsEric Laurent2012-06-043-153/+302
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 46604553: Ensure global effects are on the correct outputMarco Nelissen2012-06-011-16/+38
|\ \ \ | |/ / | | | | | | | | | * commit '4660455366d2ee64cb65f0ecd6f7ddeb1c17bac6': Ensure global effects are on the correct output
| * | Ensure global effects are on the correct outputMarco Nelissen2012-05-311-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Reconcile with jb-releaseThe Android Open Source Project2012-05-290-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: Ib51f8d004df9740327110e2dfd9a3be26cee5800
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| |\ \ | | |/ | |/|
* | | am 1afd84f6: audio policy: allow disabling A2DP for media.Eric Laurent2012-05-242-15/+23
|\ \ \ | |/ / | | | | | | | | | * commit '1afd84f62291d20414cbf58c7af01462a8fdca60': audio policy: allow disabling A2DP for media.
| * | audio policy: allow disabling A2DP for media.Eric Laurent2012-05-222-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added FORCE_NO_BT_A2DP forced use to allow applications to override default policy to use A2DP whenever connected. Bug 6485897. Change-Id: I784271c062294fbe1aff7884965075b40c68dc24
* | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: Idddf82739bdf873cc163171dd5469f017f7d07a6
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| |\ \ | | |/ | |/|
generated by cgit v1.1 at 2024-05-09 09:24:45 +0000