OSDN Git Service
Eric Laurent [Thu, 4 Apr 2013 21:59:22 +0000 (14:59 -0700)]
am
5a950c96: audio policy: reuse direct output when possible
* commit '
5a950c960cd40648cc3ab8defe817f88e0a7ecf4':
audio policy: reuse direct output when possible
Eric Laurent [Thu, 4 Apr 2013 00:31:04 +0000 (17:31 -0700)]
audio policy: reuse direct output when possible
Modified getOutput() logic to not systematically
open a new direct output when a profile matches a request.
This causes a problem when transitioning between two
multichannel tracks as the audio HAL will most of the times
only support one direct output stream open at a time.
Instead, reuse an open output if all the parameters match
or force close the output before reopening it.
Also modify releaseOuput():
- close a direct output only if no client is using it anymore
- call closeOutput() instead of removing the output from
the open output list: this factors in code executed when closing an
output stream.
Bug
8388941
Change-Id: Ic3d3beb21063622ddf57a5b932f93d56f2986f54
Eric Laurent [Tue, 26 Mar 2013 00:26:46 +0000 (00:26 +0000)]
am
80f5b040: audio policy: fix music glitch when starting call
* commit '
80f5b0400f86d49e70aa1a793b34f34492f005bc':
audio policy: fix music glitch when starting call
Eric Laurent [Mon, 25 Mar 2013 16:58:09 +0000 (09:58 -0700)]
audio policy: fix music glitch when starting call
When answering a call in silent mode, music playing over A2DP
was not immediately muted by current audio policy manager logic.
The fix consists in muting media strategy on all output streams
immediately when entering in call.
Also add methods to AudioOutputDescriptor to report
recent global, per strategy and per stream activity.
Bug
8315512
Change-Id: I4a90eb05db50e4f22374d02b1e647e8662f6bec6
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:56:10 +0000 (20:56 +0000)]
am
58d6b9eb: (-s ours) am
10f06dc0: am
0b904fda: am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
58d6b9eb20a9805ea7cecff1df01259e8a2ce1d4':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:29 +0000 (13:44 -0700)]
am
10f06dc0: am
0b904fda: am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
10f06dc0787c20d9ffab07e59654322b9348c056':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:35 +0000 (13:13 -0700)]
am
0b904fda: am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
0b904fdaa636372e9173f1fb4a5dae5c382aabb8':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:42 +0000 (13:00 -0700)]
am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
93bb0058bd3e5c0703797289f88a033789249766':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:42:00 +0000 (12:42 -0700)]
am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:41 +0000 (12:27 -0700)]
am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b25a2fcfae02ff802b81978ec82f0da8d2735d77':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:20:16 +0000 (12:20 -0700)]
Reconcile with jb-mr1-release - do not merge
Eric Laurent [Wed, 27 Feb 2013 00:10:05 +0000 (16:10 -0800)]
audio policy: fix in call capture device
Allow use of default capture device when
AUDIO_SOURCE_VOICE_UPLINK is specified and the platform
does not support AUDIO_DEVICE_IN_VOICE_CALL.
Change-Id: Ibbc314f60c91e5a0fa75d57878f2d2a96ef2d83b
Eric Laurent [Sat, 2 Mar 2013 01:35:51 +0000 (17:35 -0800)]
audio policy: fix music glitch with touch sounds
There is a brief music interruption when a touch sound
is played the first time after the headset insertion.
This is due to a bug in audio policy manager logic to prevent
volume bursts while changing device while music is playing.
The fix consists in muting music only on current output stream
when changing device, not all output streams.
Also prevent unecessary device change if the requested device
is not supported by the output stream profile.
Bug:
8301565
Change-Id: I00daab19bbdda10ca856a05fa32a1e333e1b9469
Dmitry Shmidt [Thu, 28 Feb 2013 01:45:59 +0000 (17:45 -0800)]
wifi: Remove obsolete variables
Change-Id: I4759c26bf59f593650374ae4b205e8a1f83a8d68
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Mon, 11 Feb 2013 21:42:47 +0000 (21:42 +0000)]
Merge "audio policy: fix in call audio setup delay"
Eric Laurent [Mon, 11 Feb 2013 20:35:42 +0000 (12:35 -0800)]
audio policy: fix in call audio setup delay
There is a delay inserted by audio policy manager before switching
device when entering in call mode to allow music playback to be muted
before the device actually switches.
This delay can be significant when high latency outputs (e.g. deep buffers) are
present and should not be applied if the output is not active.
Issue
7612431.
Change-Id: I04b666769033dbfdc861752b030d3f7bdffe9435
Jean-Michel Trivi [Tue, 5 Feb 2013 00:28:31 +0000 (16:28 -0800)]
Identify remote stream activity, used for notification routing
Add support for checking remote stream activity.
Don't route notifications like media when media active remotely.
Add remote stream activity query in audio policy HAL.
Bug
7485803
Change-Id: Ifb722c7f9ffbfbdc877fec5156bcfc09bec40651
Eric Laurent [Fri, 18 Jan 2013 01:27:26 +0000 (17:27 -0800)]
audio policy: added front + back mic
Added definition to parse front + back mic from input descriptors
in audio_policy.conf file.
Change-Id: I9ebdeac664e12104589a52d15acbbfc4db787923
Eric Laurent [Thu, 8 Nov 2012 23:59:48 +0000 (15:59 -0800)]
am
8d674a4b: (-s ours) am
85f8faa6: am
a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '
8d674a4b6f4300df90415889c2f57fe8b383e867':
audio policy: notification delay - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 23:59:47 +0000 (15:59 -0800)]
am
2fbecbad: (-s ours) am
8d8ad2ec: am
fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '
2fbecbad88f0c6298c35a5bc1bf87aa244059754':
audio policy: fix volume problem - DO NOT MERGE
John Grossman [Thu, 8 Nov 2012 23:59:46 +0000 (15:59 -0800)]
am
8254f4b2: (-s ours) am
503d13af: am
da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '
8254f4b244a1f5d65054831d2b0afe53c67c3898':
audio policy: fix dynamic parameter - DO NOT MERGE
Jason Simmons [Thu, 8 Nov 2012 23:59:45 +0000 (15:59 -0800)]
am
81e6a2e0: (-s ours) am
77514217: am
e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '
81e6a2e099546f4580253d2b0262d43f2a4090aa':
audio policy: direct output fix - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 23:48:01 +0000 (15:48 -0800)]
am
85f8faa6: am
a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '
85f8faa65754011161f40b2047fa19a6128ba88c':
audio policy: notification delay - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 23:48:00 +0000 (15:48 -0800)]
am
8d8ad2ec: am
fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '
8d8ad2ec94dfab5555dbac71c8d5fe8d1cde0cea':
audio policy: fix volume problem - DO NOT MERGE
John Grossman [Thu, 8 Nov 2012 23:45:09 +0000 (15:45 -0800)]
am
503d13af: am
da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '
503d13af915529f78312c6cd3fc951923c45f4f2':
audio policy: fix dynamic parameter - DO NOT MERGE
Jason Simmons [Thu, 8 Nov 2012 23:45:09 +0000 (15:45 -0800)]
am
77514217: am
e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '
77514217215c1b7872ece94dc9d3ceef62cdefbb':
audio policy: direct output fix - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 22:35:56 +0000 (14:35 -0800)]
am
a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '
a7c17deb32fe28230b77b0dff17bb113088a5c16':
audio policy: notification delay - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 22:35:56 +0000 (14:35 -0800)]
am
fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '
fe43d163d6646a175934f0752fa05e3e53e89da4':
audio policy: fix volume problem - DO NOT MERGE
John Grossman [Thu, 8 Nov 2012 18:09:04 +0000 (10:09 -0800)]
am
da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '
da06cb6142faa3e09cbf7226ca9c75e45661095b':
audio policy: fix dynamic parameter - DO NOT MERGE
Jason Simmons [Thu, 8 Nov 2012 18:06:35 +0000 (10:06 -0800)]
am
e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '
e912bfd79880ea5faac0fbcdb4e696125e151e18':
audio policy: direct output fix - DO NOT MERGE
Eric Laurent [Wed, 7 Nov 2012 20:09:54 +0000 (12:09 -0800)]
audio policy: notification delay - DO NOT MERGE
merge from master:
"audio policy: fix notification start delay
The mechanism delaying notifications in case of
muliple active outputs with long latencies must
take into account recently paused audio tracks.
Bug
7400428."
Change-Id: I4ac9dfac81336e33f475b4f28df82713707d0c46
Eric Laurent [Thu, 8 Nov 2012 17:43:15 +0000 (09:43 -0800)]
Merge "audio policy: fix notification start delay"
Eric Laurent [Tue, 30 Oct 2012 23:14:04 +0000 (16:14 -0700)]
audio policy: fix volume problem - DO NOT MERGE
merge from master:
"audio policy: fix volume change when disabling SCO
commit
76e97d39 introduced a regression by having setDeviceConnectionState()
force a device change on duplicated outputs even if the selected device is 0.
This also forces a device 0 for the two outputs it is duplicated to,
which may override a valid device selection on those outputs and apply
default volumes.
Bug
7429869."
Change-Id: I37dd66343c54eb27e420089edbda04444fa1e2c6
John Grossman [Tue, 30 Oct 2012 01:42:43 +0000 (18:42 -0700)]
audio policy: fix dynamic parameter - DO NOT MERGE
merge from master:
"Fix a parse error in checkOutputForDevice
Fix a small parsing error in parsing the supported formats and sample
rates of a stream out with dynamic values for these parameters. The
channel mask parser was properly skipping the "=" in the setting
string, but formats and sample rates were not (cauing the first
reported format and sample rate to end up being skipped)"
Change-Id: Id227a44f6b5fc0c223f2ce74f94ebb6abc5fa77d
Signed-off-by: John Grossman <johngro@google.com>
Jason Simmons [Wed, 31 Oct 2012 17:50:12 +0000 (10:50 -0700)]
audio policy: direct output fix - DO NOT MERGE
merge "Close a newly opened direct output if its parameters are invalid"
from master
Change-Id: I27ac015217480a854d25273ab9498949971b411a
Irfan Sheriff [Thu, 8 Nov 2012 14:18:53 +0000 (06:18 -0800)]
am
b1e73538: am
7fcf81e3: am
745e7fd4: Fix stop supplicant api
* commit '
b1e73538da3e719f404ca014c48fd8dddf81c141':
Fix stop supplicant api
Jason Simmons [Thu, 8 Nov 2012 14:18:52 +0000 (06:18 -0800)]
am
c8bc2286: am
7aab5b0f: Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev
* commit '
c8bc22869096ee413717102d3f5d0ca804cc3174':
Close a newly opened direct output if its parameters are invalid
Irfan Sheriff [Thu, 8 Nov 2012 14:14:28 +0000 (06:14 -0800)]
am
7fcf81e3: am
745e7fd4: Fix stop supplicant api
* commit '
7fcf81e3a4ac036f23d818d9d5a8eba4387b9b96':
Fix stop supplicant api
Jason Simmons [Thu, 8 Nov 2012 14:12:35 +0000 (06:12 -0800)]
am
7aab5b0f: Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev
* commit '
7aab5b0f27b9567d077cc6c01807811027066619':
Close a newly opened direct output if its parameters are invalid
Eric Laurent [Wed, 7 Nov 2012 20:09:54 +0000 (12:09 -0800)]
audio policy: fix notification start delay
The mechanism delaying notifications in case of
muliple active outputs with long latencies must
take into account recently paused audio tracks.
Bug
7400428.
Change-Id: I4ac9dfac81336e33f475b4f28df82713707d0c46
Irfan Sheriff [Wed, 7 Nov 2012 01:41:35 +0000 (17:41 -0800)]
am
745e7fd4: Fix stop supplicant api
* commit '
745e7fd4e09db2b47371338ee54c54255e286473':
Fix stop supplicant api
Irfan Sheriff [Sun, 4 Nov 2012 06:21:39 +0000 (23:21 -0700)]
Fix stop supplicant api
Bug:
7227463
Change-Id: I4576e223c69dd67bd714fefecf0a1047770362fd
Jason Simmons [Tue, 6 Nov 2012 21:23:13 +0000 (13:23 -0800)]
Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev
The Android Open Source Project [Tue, 6 Nov 2012 20:31:23 +0000 (12:31 -0800)]
am
fd1523d7: (-s ours) am
ebed8a53: am
62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
fd1523d782fcf402b5ee033d4134d8601d31c6c9':
The Android Open Source Project [Tue, 6 Nov 2012 20:27:01 +0000 (12:27 -0800)]
am
ebed8a53: am
62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
ebed8a53cca62d19d13ec2381c7e0f4acf1ba302':
The Android Open Source Project [Tue, 6 Nov 2012 20:20:39 +0000 (12:20 -0800)]
am
62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
62fcb21577ccdd68dddd6b6984ad0ce58ee0c228':
The Android Open Source Project [Tue, 6 Nov 2012 20:17:42 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia0e74b5de81f7a112a2e4d829111c6cc7d937617
Jason Simmons [Wed, 31 Oct 2012 17:50:12 +0000 (10:50 -0700)]
Close a newly opened direct output if its parameters are invalid
Change-Id: I27ac015217480a854d25273ab9498949971b411a
The Android Open Source Project [Wed, 31 Oct 2012 16:22:50 +0000 (09:22 -0700)]
am
cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
cc8fedd302110af6bd1cc3aa8268639ca64a9c46':
The Android Open Source Project [Wed, 31 Oct 2012 16:17:21 +0000 (09:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie8d4bb5b8a60d1c3624fb7f7ded0d750ce9deb7e
Eric Laurent [Tue, 30 Oct 2012 23:14:04 +0000 (16:14 -0700)]
audio policy: fix volume change when disabling SCO
commit
76e97d39 introduced a regression by having setDeviceConnectionState()
force a device change on duplicated outputs even if the selected device is 0.
This also forces a device 0 for the two outputs it is duplicated to,
which may override a valid device selection on those outputs and apply
default volumes.
Bug
7429869.
Change-Id: I37dd66343c54eb27e420089edbda04444fa1e2c6
John Grossman [Tue, 30 Oct 2012 17:12:02 +0000 (10:12 -0700)]
am
9405f9be: am
5debe925: Fix a parse error in checkOutputForDevice
* commit '
9405f9be547e55fa6704660130a0d3489186f91a':
Fix a parse error in checkOutputForDevice
Eric Laurent [Tue, 30 Oct 2012 16:55:00 +0000 (09:55 -0700)]
am
92be42eb: am
5a484b75: audio policy: active analog dock force usage
* commit '
92be42ebb9a62876a003b712ddd2968dde2d6476':
audio policy: active analog dock force usage
John Grossman [Tue, 30 Oct 2012 02:03:57 +0000 (19:03 -0700)]
am
5debe925: Fix a parse error in checkOutputForDevice
* commit '
5debe92591363de3d73bc32b62f23df707b1aecf':
Fix a parse error in checkOutputForDevice
John Grossman [Tue, 30 Oct 2012 01:42:43 +0000 (18:42 -0700)]
Fix a parse error in checkOutputForDevice
Fix a small parsing error in parsing the supported formats and sample
rates of a stream out with dynamic values for these parameters. The
channel mask parser was properly skipping the "=" in the setting
string, but formats and sample rates were not (cauing the first
reported format and sample rate to end up being skipped)
Change-Id: Id227a44f6b5fc0c223f2ce74f94ebb6abc5fa77d
Signed-off-by: John Grossman <johngro@google.com>
Eric Laurent [Mon, 29 Oct 2012 21:32:05 +0000 (14:32 -0700)]
am
5a484b75: audio policy: active analog dock force usage
* commit '
5a484b753cc72d6a50c1dd3bbf68b3403c741a3a':
audio policy: active analog dock force usage
The Android Automerger [Mon, 29 Oct 2012 18:20:03 +0000 (11:20 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Sat, 27 Oct 2012 01:04:03 +0000 (18:04 -0700)]
audio policy: active analog dock force usage
Qualify the selection of the analog dock for media by the force use.
Bug
7302106.
Change-Id: I2ea48fd43866ce8491085bba72a27751b2203401
The Android Automerger [Fri, 19 Oct 2012 13:59:44 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Thu, 18 Oct 2012 23:34:11 +0000 (16:34 -0700)]
am
6d4af736: am
06eda4e2: Merge "Fix native crash when driver commands time out" into jb-mr1-dev
* commit '
6d4af736d09fcc7165d3e36bc86b7292d76ad1a4':
Fix native crash when driver commands time out
Irfan Sheriff [Thu, 18 Oct 2012 23:31:35 +0000 (16:31 -0700)]
am
06eda4e2: Merge "Fix native crash when driver commands time out" into jb-mr1-dev
* commit '
06eda4e2d5cb8aff7253e6be111553086fbc9b82':
Fix native crash when driver commands time out
Irfan Sheriff [Thu, 18 Oct 2012 23:27:35 +0000 (16:27 -0700)]
Merge "Fix native crash when driver commands time out" into jb-mr1-dev
Irfan Sheriff [Thu, 18 Oct 2012 23:16:21 +0000 (16:16 -0700)]
Fix native crash when driver commands time out
Bug:
7361130
Change-Id: Ia076b4ec84a4a0e05ba9eaa53ed732fa041fca6a
Eric Laurent [Thu, 18 Oct 2012 19:26:59 +0000 (12:26 -0700)]
am
79a4e2ef: am
89ef58f4: Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev
* commit '
79a4e2efc502979c21ebbc164691d61b1634362a':
audio policy: fix scanning of supported devices
Eric Laurent [Thu, 18 Oct 2012 19:23:30 +0000 (12:23 -0700)]
am
89ef58f4: Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev
* commit '
89ef58f4c0e4920d8f18112a31a4c80c766a2afa':
audio policy: fix scanning of supported devices
Eric Laurent [Thu, 18 Oct 2012 18:38:54 +0000 (11:38 -0700)]
Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev
Eric Laurent [Thu, 18 Oct 2012 18:02:02 +0000 (11:02 -0700)]
am
d22bb8f4: am
672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
* commit '
d22bb8f46c5e3699949c7c54cc61e994979cd6e9':
audio policy: tune voice/video chat volumes
Eric Laurent [Thu, 18 Oct 2012 17:59:59 +0000 (10:59 -0700)]
am
672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
* commit '
672e9ace42a3f7d4f93460efc79ebd444786a5eb':
audio policy: tune voice/video chat volumes
Eric Laurent [Thu, 18 Oct 2012 17:54:44 +0000 (10:54 -0700)]
Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
Eric Laurent [Thu, 18 Oct 2012 00:49:41 +0000 (17:49 -0700)]
audio policy: fix scanning of supported devices
Fix is a bug in checkOutputsForDevice() which makes that we can
try to reopen an output stream after a new device is connected because
we believe that no opened output is available for this device.
Bug
7369475.
Change-Id: I2290a9b5ba102657cda495fbb8a995e0003b883a
The Android Automerger [Wed, 17 Oct 2012 23:07:17 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
SathishKumar Mani [Wed, 17 Oct 2012 17:28:53 +0000 (10:28 -0700)]
am
8ec910e0: am
77268631: audio policy: update output delayMs in setPhoneState
* commit '
8ec910e02008177844169c423c2aec42046440b7':
audio policy: update output delayMs in setPhoneState
SathishKumar Mani [Wed, 17 Oct 2012 17:26:23 +0000 (10:26 -0700)]
am
77268631: audio policy: update output delayMs in setPhoneState
* commit '
772686310a3bc44d93591349e174a60360a3d30d':
audio policy: update output delayMs in setPhoneState
Eric Laurent [Wed, 17 Oct 2012 17:14:14 +0000 (10:14 -0700)]
audio policy: tune voice/video chat volumes
Add new volume curves for VOICE_CALL stream type
to improve voice/video chat volume on speakers.
Bug
7346643.
Change-Id: Ib282a97570d2234deec6b58391bdfc45846d9cc0
SathishKumar Mani [Thu, 11 Oct 2012 01:58:40 +0000 (18:58 -0700)]
audio policy: update output delayMs in setPhoneState
- Issue: When call is connected in HDMI while playing music,
Playback is routed to phone shortly
- Cause: delayMs is not updated correctly, and no delay is
set when setOutputDevice is called
- Fix: update delayMs with biggest mOutput latency and mute
STRATEGY_MEDIA on all outputs
Bug:
7268860
Change-Id: I12b75443a29ab8485314bd0cbfe5ee4789be5c29
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Automerger [Wed, 17 Oct 2012 13:59:34 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Wed, 17 Oct 2012 00:20:08 +0000 (17:20 -0700)]
am
d6745071: am
aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev
* commit '
d6745071c1237bbc6f341d8a1df3ca33038869de':
audio policy: do not route in call audio to HDMI
Eric Laurent [Wed, 17 Oct 2012 00:17:14 +0000 (17:17 -0700)]
am
aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev
* commit '
aac673172cd61cd862228a8d41a8f3e7d1e016fd':
audio policy: do not route in call audio to HDMI
Marco Nelissen [Wed, 17 Oct 2012 00:16:37 +0000 (17:16 -0700)]
am
d4165152: am
85ad78f2: Initialize mStrategyMutedByDevice
* commit '
d41651524bb3d2b9aceec253c0a2e2c5033fee2b':
Initialize mStrategyMutedByDevice
Marco Nelissen [Wed, 17 Oct 2012 00:13:42 +0000 (17:13 -0700)]
am
85ad78f2: Initialize mStrategyMutedByDevice
* commit '
85ad78f27ca032e90af0f2100659d12c16322c76':
Initialize mStrategyMutedByDevice
Eric Laurent [Wed, 17 Oct 2012 00:12:44 +0000 (17:12 -0700)]
Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev
Marco Nelissen [Tue, 16 Oct 2012 22:00:37 +0000 (15:00 -0700)]
Initialize mStrategyMutedByDevice
Valgrind found this
Change-Id: I24c640c2b0b6cac129c23bfc18828aff005ec952
Eric Laurent [Tue, 16 Oct 2012 21:59:36 +0000 (14:59 -0700)]
audio policy: do not route in call audio to HDMI
In call audio shuold not be routed to HDMI, S/PDIF or USB
by default as most platform do not support it.
Bug
7339490.
Change-Id: Iac4803f3fbde0c321fc7b37ab7ba34af6a16b4aa
The Android Automerger [Tue, 16 Oct 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Tue, 16 Oct 2012 03:25:56 +0000 (20:25 -0700)]
am
a1084207: am
b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev
* commit '
a1084207a76773319d46cfc1ea7376245b0dd1f3':
Remote audio submix always has priority for media, only plays media
Jean-Michel Trivi [Tue, 16 Oct 2012 03:18:03 +0000 (20:18 -0700)]
am
b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev
* commit '
b707cf22cf700e28f54c58cba8eeb38538735510':
Remote audio submix always has priority for media, only plays media
Jean-Michel Trivi [Mon, 15 Oct 2012 23:26:15 +0000 (16:26 -0700)]
Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev
The Android Open Source Project [Mon, 15 Oct 2012 14:43:17 +0000 (07:43 -0700)]
am
8280f934: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
8280f93403bfd5d5e24ebfb969f22e2e5d36f85e':
The Android Open Source Project [Mon, 15 Oct 2012 14:39:15 +0000 (07:39 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0ae4d2e710b5380f13fea6f62352842679ed248b
The Android Automerger [Fri, 12 Oct 2012 23:34:35 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:32:49 +0000 (16:32 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Irfan Sheriff [Fri, 12 Oct 2012 19:03:45 +0000 (12:03 -0700)]
am
605ca505: am
c4c58b24: Merge "Fix native crash" into jb-mr1-dev
* commit '
605ca505f43f4e21f6caed855d0c761b8bc2f6d1':
Fix native crash
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:33:40 +0000 (07:33 -0700)]
am
0e448d32: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
* commit '
0e448d3233af3c1cd9b12b38e9c5c88f57c5944f':
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
Jean-Michel Trivi [Fri, 12 Oct 2012 01:06:33 +0000 (18:06 -0700)]
Remote audio submix always has priority for media, only plays media
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
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:08:26 +0000 (08:08 -0700)]
am
d612ec14: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
d612ec14226d082d246d8448637d15888733a8b9':
OSDN Git Service
