summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| |\ \ | | |/ | |/|
* | | am 01e6272f: audio policy: fix in call volume problem.Eric Laurent2012-05-172-14/+34
|\| | | | | | | | | | | | | | * commit '01e6272f0a3a7d1d53e826012377ff9269b03b06': audio policy: fix in call volume problem.
| * | audio policy: fix in call volume problem.Eric Laurent2012-05-152-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| \ \
*-. | | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \| | | |/ / |/| / | |/ Change-Id: I4d5083c87b3e9fc0bc5168dca5328db64ee5b936
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
|/|
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-240-0/+0
| | | |\
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-100-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-030-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-200-0/+0
| | | | | | | | | | | | | | | | |\