summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am 7fcf81e3: am 745e7fd4: Fix stop supplicant apiIrfan Sheriff2012-11-082-2/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '7fcf81e3a4ac036f23d818d9d5a8eba4387b9b96': Fix stop supplicant api
| | * | | | | am 745e7fd4: Fix stop supplicant apiIrfan Sheriff2012-11-062-2/+11
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '745e7fd4e09db2b47371338ee54c54255e286473': Fix stop supplicant api
| | | * | | | Fix stop supplicant apiIrfan Sheriff2012-11-062-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7227463 Change-Id: I4576e223c69dd67bd714fefecf0a1047770362fd
* | | | | | | am c8bc2286: am 7aab5b0f: Merge "Close a newly opened direct output if its ↵Jason Simmons2012-11-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters are invalid" into jb-mr1-aah-dev * commit 'c8bc22869096ee413717102d3f5d0ca804cc3174': Close a newly opened direct output if its parameters are invalid
| * | | | | | am 7aab5b0f: Merge "Close a newly opened direct output if its parameters are ↵Jason Simmons2012-11-081-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid" into jb-mr1-aah-dev * commit '7aab5b0f27b9567d077cc6c01807811027066619': Close a newly opened direct output if its parameters are invalid
| | * | | | | Merge "Close a newly opened direct output if its parameters are invalid" ↵Jason Simmons2012-11-061-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-aah-dev
| | | * | | | | Close a newly opened direct output if its parameters are invalidJason Simmons2012-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27ac015217480a854d25273ab9498949971b411a
* | | | | | | | am fd1523d7: (-s ours) am ebed8a53: am 62fcb215: Reconcile with ↵The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | jb-mr1-factory-release jb-mr1-release - do not merge * commit 'fd1523d782fcf402b5ee033d4134d8601d31c6c9':
| * | | | | | am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release ↵The Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit 'ebed8a53cca62d19d13ec2381c7e0f4acf1ba302':
| | * | | | | am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / * commit '62fcb21577ccdd68dddd6b6984ad0ce58ee0c228':
| | | | | |
| | | | \ \
| | | *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | / | | | | | |/ Change-Id: Ia0e74b5de81f7a112a2e4d829111c6cc7d937617
* | | | | | am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit 'cc8fedd302110af6bd1cc3aa8268639ca64a9c46':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: Ie8d4bb5b8a60d1c3624fb7f7ded0d750ce9deb7e
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | |\ \ \
* | | | | | | | | | audio policy: fix volume change when disabling SCOEric Laurent2012-10-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | am 9405f9be: am 5debe925: Fix a parse error in checkOutputForDeviceJohn Grossman2012-10-301-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9405f9be547e55fa6704660130a0d3489186f91a': Fix a parse error in checkOutputForDevice
| * | | | | | | | | am 5debe925: Fix a parse error in checkOutputForDeviceJohn Grossman2012-10-291-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5debe92591363de3d73bc32b62f23df707b1aecf': Fix a parse error in checkOutputForDevice
| | * | | | | | | | Fix a parse error in checkOutputForDeviceJohn Grossman2012-10-291-2/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | am 92be42eb: am 5a484b75: audio policy: active analog dock force usageEric Laurent2012-10-301-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92be42ebb9a62876a003b712ddd2968dde2d6476': audio policy: active analog dock force usage
| * | | | | | | | am 5a484b75: audio policy: active analog dock force usageEric Laurent2012-10-291-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a484b753cc72d6a50c1dd3bbf68b3403c741a3a': audio policy: active analog dock force usage
| | * | | | | | | audio policy: active analog dock force usageEric Laurent2012-10-261-1/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qualify the selection of the analog dock for media by the force use. Bug 7302106. Change-Id: I2ea48fd43866ce8491085bba72a27751b2203401
* | | | | | | | am 6d4af736: am 06eda4e2: Merge "Fix native crash when driver commands time ↵Irfan Sheriff2012-10-181-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out" into jb-mr1-dev * commit '6d4af736d09fcc7165d3e36bc86b7292d76ad1a4': Fix native crash when driver commands time out
| * | | | | | | am 06eda4e2: Merge "Fix native crash when driver commands time out" into ↵Irfan Sheriff2012-10-181-1/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '06eda4e2d5cb8aff7253e6be111553086fbc9b82': Fix native crash when driver commands time out
| | * | | | | | Merge "Fix native crash when driver commands time out" into jb-mr1-devIrfan Sheriff2012-10-181-1/+7
| | |\ \ \ \ \ \
| | | * | | | | | Fix native crash when driver commands time outIrfan Sheriff2012-10-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7361130 Change-Id: Ia076b4ec84a4a0e05ba9eaa53ed732fa041fca6a
* | | | | | | | | am 79a4e2ef: am 89ef58f4: Merge "audio policy: fix scanning of supported ↵Eric Laurent2012-10-181-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devices" into jb-mr1-dev * commit '79a4e2efc502979c21ebbc164691d61b1634362a': audio policy: fix scanning of supported devices
| * | | | | | | | am 89ef58f4: Merge "audio policy: fix scanning of supported devices" into ↵Eric Laurent2012-10-181-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '89ef58f4c0e4920d8f18112a31a4c80c766a2afa': audio policy: fix scanning of supported devices
| | * | | | | | | Merge "audio policy: fix scanning of supported devices" into jb-mr1-devEric Laurent2012-10-181-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | audio policy: fix scanning of supported devicesEric Laurent2012-10-171-2/+2
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am d22bb8f4: am 672e9ace: Merge "audio policy: tune voice/video chat ↵Eric Laurent2012-10-182-18/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volumes" into jb-mr1-dev * commit 'd22bb8f46c5e3699949c7c54cc61e994979cd6e9': audio policy: tune voice/video chat volumes
| * | | | | | | | am 672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-devEric Laurent2012-10-182-18/+22
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '672e9ace42a3f7d4f93460efc79ebd444786a5eb': audio policy: tune voice/video chat volumes
| | * | | | | | | Merge "audio policy: tune voice/video chat volumes" into jb-mr1-devEric Laurent2012-10-182-18/+22
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | audio policy: tune voice/video chat volumesEric Laurent2012-10-172-18/+22
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new volume curves for VOICE_CALL stream type to improve voice/video chat volume on speakers. Bug 7346643. Change-Id: Ib282a97570d2234deec6b58391bdfc45846d9cc0
* | | | | | | | am 8ec910e0: am 77268631: audio policy: update output delayMs in setPhoneStateSathishKumar Mani2012-10-171-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ec910e02008177844169c423c2aec42046440b7': audio policy: update output delayMs in setPhoneState
| * | | | | | | am 77268631: audio policy: update output delayMs in setPhoneStateSathishKumar Mani2012-10-171-0/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '772686310a3bc44d93591349e174a60360a3d30d': audio policy: update output delayMs in setPhoneState
| | * | | | | | audio policy: update output delayMs in setPhoneStateSathishKumar Mani2012-10-171-0/+16
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | | | am d6745071: am aac67317: Merge "audio policy: do not route in call audio to ↵Eric Laurent2012-10-161-20/+24
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDMI" into jb-mr1-dev * commit 'd6745071c1237bbc6f341d8a1df3ca33038869de': audio policy: do not route in call audio to HDMI
| * | | | | | am aac67317: Merge "audio policy: do not route in call audio to HDMI" into ↵Eric Laurent2012-10-161-20/+24
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'aac673172cd61cd862228a8d41a8f3e7d1e016fd': audio policy: do not route in call audio to HDMI
| | * | | | | Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-devEric Laurent2012-10-161-20/+24
| | |\ \ \ \ \
| | | * | | | | audio policy: do not route in call audio to HDMIEric Laurent2012-10-161-20/+24
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am d4165152: am 85ad78f2: Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd41651524bb3d2b9aceec253c0a2e2c5033fee2b': Initialize mStrategyMutedByDevice
| * | | | | | am 85ad78f2: Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '85ad78f27ca032e90af0f2100659d12c16322c76': Initialize mStrategyMutedByDevice
| | * | | | | Initialize mStrategyMutedByDeviceMarco Nelissen2012-10-161-0/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind found this Change-Id: I24c640c2b0b6cac129c23bfc18828aff005ec952
* | | | | | am a1084207: am b707cf22: Merge "Remote audio submix always has priority for ↵Jean-Michel Trivi2012-10-152-6/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media, only plays media" into jb-mr1-dev * commit 'a1084207a76773319d46cfc1ea7376245b0dd1f3': Remote audio submix always has priority for media, only plays media
| * | | | | am b707cf22: Merge "Remote audio submix always has priority for media, only ↵Jean-Michel Trivi2012-10-152-6/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plays media" into jb-mr1-dev * commit 'b707cf22cf700e28f54c58cba8eeb38538735510': Remote audio submix always has priority for media, only plays media
| | * | | | Merge "Remote audio submix always has priority for media, only plays media" ↵Jean-Michel Trivi2012-10-152-6/+5
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into jb-mr1-dev