Commit graph

455 commits

Author SHA1 Message Date
Jonathan DE CESCO
eed817e46e wifi: check if supplicant is running before starting it
Wrong property was used to check if wpa_supplicant was running.
Fix this

Change-Id: I6a5bd7a3acae84f5ba4bba317d04191e0e59b2e7
Author: Jonathan DE CESCO <jonathan.de.cesco@intel.com>
Signed-off-by: Jonathan DE CESCO <jonathan.de.cesco@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 66748
2013-01-07 10:42:31 +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
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
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
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
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
cc8fedd302 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie8d4bb5b8a60d1c3624fb7f7ded0d750ce9deb7e
2012-10-31 09:17:21 -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
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
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
Eric Laurent
d22bb8f46c am 672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
* commit '672e9ace42a3f7d4f93460efc79ebd444786a5eb':
  audio policy: tune voice/video chat volumes
2012-10-18 10:59:59 -07:00
Eric Laurent
672e9ace42 Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev 2012-10-18 10:54:45 -07:00
Eric Laurent
fd8cecbee6 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
2012-10-17 17:49:41 -07:00
The Android Automerger
1f5d029e60 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 16:07:17 -07:00
SathishKumar Mani
8ec910e020 am 77268631: audio policy: update output delayMs in setPhoneState
* commit '772686310a3bc44d93591349e174a60360a3d30d':
  audio policy: update output delayMs in setPhoneState
2012-10-17 10:26:23 -07:00
Eric Laurent
0d6490a58b 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
2012-10-17 10:22:29 -07:00
SathishKumar Mani
772686310a 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>
2012-10-17 10:20:37 -07:00
The Android Automerger
ca834a4c51 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 06:59:34 -07:00
Eric Laurent
d6745071c1 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
2012-10-16 17:17:14 -07:00
Marco Nelissen
d41651524b am 85ad78f2: Initialize mStrategyMutedByDevice
* commit '85ad78f27ca032e90af0f2100659d12c16322c76':
  Initialize mStrategyMutedByDevice
2012-10-16 17:13:42 -07:00
Eric Laurent
aac673172c Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev 2012-10-16 17:12:44 -07:00
Marco Nelissen
85ad78f27c Initialize mStrategyMutedByDevice
Valgrind found this

Change-Id: I24c640c2b0b6cac129c23bfc18828aff005ec952
2012-10-16 15:00:37 -07:00
Eric Laurent
b52f373bd5 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
2012-10-16 14:59:36 -07:00
The Android Automerger
19ee2e46c0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-16 06:59:32 -07:00
Jean-Michel Trivi
a1084207a7 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
2012-10-15 20:18:03 -07:00
Jean-Michel Trivi
b707cf22cf Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev 2012-10-15 16:26:15 -07:00