Commit graph

482 commits

Author SHA1 Message Date
Eric Laurent
8bf56b16e5 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
2013-02-11 12:48:20 -08:00
Eric Laurent
60758e27a4 audio policy: added front + back mic
Added definition to parse front + back mic from input descriptors
in audio_policy.conf file.

Change-Id: I9ebdeac664e12104589a52d15acbbfc4db787923
2013-01-22 17:07:33 -08:00
Eric Laurent
49637a296a am 8d674a4b: (-s ours) am 85f8faa6: am a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '8d674a4b6f4300df90415889c2f57fe8b383e867':
  audio policy: notification delay - DO NOT MERGE
2012-11-08 15:59:48 -08:00
Eric Laurent
d28170bb0f 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
2012-11-08 15:59:47 -08:00
John Grossman
5c3b448c13 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
2012-11-08 15:59:46 -08:00
Jason Simmons
c5527033f1 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
2012-11-08 15:59:45 -08:00
Eric Laurent
8d674a4b6f am 85f8faa6: am a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '85f8faa65754011161f40b2047fa19a6128ba88c':
  audio policy: notification delay - DO NOT MERGE
2012-11-08 15:48:01 -08:00
Eric Laurent
2fbecbad88 am 8d8ad2ec: am fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '8d8ad2ec94dfab5555dbac71c8d5fe8d1cde0cea':
  audio policy: fix volume problem - DO NOT MERGE
2012-11-08 15:48:00 -08:00
John Grossman
8254f4b244 am 503d13af: am da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '503d13af915529f78312c6cd3fc951923c45f4f2':
  audio policy: fix dynamic parameter - DO NOT MERGE
2012-11-08 15:45:09 -08:00
Jason Simmons
81e6a2e099 am 77514217: am e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '77514217215c1b7872ece94dc9d3ceef62cdefbb':
  audio policy: direct output fix - DO NOT MERGE
2012-11-08 15:45:09 -08:00
Eric Laurent
85f8faa657 am a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit 'a7c17deb32fe28230b77b0dff17bb113088a5c16':
  audio policy: notification delay - DO NOT MERGE
2012-11-08 14:35:56 -08:00
Eric Laurent
8d8ad2ec94 am fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit 'fe43d163d6646a175934f0752fa05e3e53e89da4':
  audio policy: fix volume problem - DO NOT MERGE
2012-11-08 14:35:56 -08:00
John Grossman
503d13af91 am da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit 'da06cb6142faa3e09cbf7226ca9c75e45661095b':
  audio policy: fix dynamic parameter - DO NOT MERGE
2012-11-08 10:09:04 -08:00
Jason Simmons
7751421721 am e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit 'e912bfd79880ea5faac0fbcdb4e696125e151e18':
  audio policy: direct output fix - DO NOT MERGE
2012-11-08 10:06:35 -08:00
Eric Laurent
a7c17deb32 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
2012-11-08 09:46:10 -08:00
Eric Laurent
911408bc76 Merge "audio policy: fix notification start delay" 2012-11-08 09:43:16 -08:00
Eric Laurent
fe43d163d6 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
2012-11-08 08:56:57 -08:00
John Grossman
da06cb6142 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>
2012-11-08 08:53:40 -08:00
Jason Simmons
e912bfd798 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
2012-11-08 08:48:34 -08:00
Irfan Sheriff
3dee034c45 am b1e73538: am 7fcf81e3: am 745e7fd4: Fix stop supplicant api
* commit 'b1e73538da3e719f404ca014c48fd8dddf81c141':
  Fix stop supplicant api
2012-11-08 06:18:53 -08:00
Jason Simmons
02580d804a 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
2012-11-08 06:18:52 -08:00
Irfan Sheriff
b1e73538da am 7fcf81e3: am 745e7fd4: Fix stop supplicant api
* commit '7fcf81e3a4ac036f23d818d9d5a8eba4387b9b96':
  Fix stop supplicant api
2012-11-08 06:14:28 -08:00
Jason Simmons
c8bc228690 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
2012-11-08 06:12:35 -08:00
Eric Laurent
42fa8215a7 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
2012-11-07 13:48:47 -08:00
Irfan Sheriff
7fcf81e3a4 am 745e7fd4: Fix stop supplicant api
* commit '745e7fd4e09db2b47371338ee54c54255e286473':
  Fix stop supplicant api
2012-11-06 17:41:35 -08:00
Irfan Sheriff
745e7fd4e0 Fix stop supplicant api
Bug: 7227463
Change-Id: I4576e223c69dd67bd714fefecf0a1047770362fd
2012-11-06 15:55:30 -08:00
Jason Simmons
7aab5b0f27 Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev 2012-11-06 13:23:14 -08:00
The Android Open Source Project
82c9851ac6 am fd1523d7: (-s ours) am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'fd1523d782fcf402b5ee033d4134d8601d31c6c9':
2012-11-06 12:31:23 -08:00
The Android Open Source Project
fd1523d782 am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'ebed8a53cca62d19d13ec2381c7e0f4acf1ba302':
2012-11-06 12:27:01 -08:00
The Android Open Source Project
ebed8a53cc am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '62fcb21577ccdd68dddd6b6984ad0ce58ee0c228':
2012-11-06 12:20:39 -08:00
The Android Open Source Project
62fcb21577 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia0e74b5de81f7a112a2e4d829111c6cc7d937617
2012-11-06 12:17:42 -08:00
Jason Simmons
10705c404c Close a newly opened direct output if its parameters are invalid
Change-Id: I27ac015217480a854d25273ab9498949971b411a
2012-10-31 10:50:12 -07:00
The Android Open Source Project
6062eb0756 am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'cc8fedd302110af6bd1cc3aa8268639ca64a9c46':
2012-10-31 09:22:50 -07:00
The Android Open Source Project
cc8fedd302 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie8d4bb5b8a60d1c3624fb7f7ded0d750ce9deb7e
2012-10-31 09:17:21 -07:00
Eric Laurent
2c72e9faa5 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
2012-10-30 16:14:04 -07:00
John Grossman
5b40644acb am 9405f9be: am 5debe925: Fix a parse error in checkOutputForDevice
* commit '9405f9be547e55fa6704660130a0d3489186f91a':
  Fix a parse error in checkOutputForDevice
2012-10-30 10:12:02 -07:00
Eric Laurent
0ec391d6b7 am 92be42eb: am 5a484b75: audio policy: active analog dock force usage
* commit '92be42ebb9a62876a003b712ddd2968dde2d6476':
  audio policy: active analog dock force usage
2012-10-30 09:55:00 -07:00
John Grossman
9405f9be54 am 5debe925: Fix a parse error in checkOutputForDevice
* commit '5debe92591363de3d73bc32b62f23df707b1aecf':
  Fix a parse error in checkOutputForDevice
2012-10-29 19:03:57 -07:00
John Grossman
5debe92591 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>
2012-10-29 18:54:12 -07:00
Eric Laurent
92be42ebb9 am 5a484b75: audio policy: active analog dock force usage
* commit '5a484b753cc72d6a50c1dd3bbf68b3403c741a3a':
  audio policy: active analog dock force usage
2012-10-29 14:32:05 -07:00
The Android Automerger
ebc42af458 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-29 11:20:03 -07:00
Eric Laurent
5a484b753c 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
2012-10-26 18:04:03 -07:00
The Android Automerger
05f5f8d71f merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-19 06:59:44 -07:00
Irfan Sheriff
08139cedcd 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
2012-10-18 16:34:11 -07:00
Irfan Sheriff
6d4af736d0 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
2012-10-18 16:31:35 -07:00
Irfan Sheriff
06eda4e2d5 Merge "Fix native crash when driver commands time out" into jb-mr1-dev 2012-10-18 16:27:36 -07:00
Irfan Sheriff
943574a822 Fix native crash when driver commands time out
Bug: 7361130
Change-Id: Ia076b4ec84a4a0e05ba9eaa53ed732fa041fca6a
2012-10-18 16:16:21 -07:00
Eric Laurent
25b11e81b3 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
2012-10-18 12:26:59 -07:00
Eric Laurent
79a4e2efc5 am 89ef58f4: Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev
* commit '89ef58f4c0e4920d8f18112a31a4c80c766a2afa':
  audio policy: fix scanning of supported devices
2012-10-18 12:23:30 -07:00
Eric Laurent
89ef58f4c0 Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev 2012-10-18 11:38:54 -07:00