OSDN Git Service
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 [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 [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: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
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: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:17:21 +0000 (09:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie8d4bb5b8a60d1c3624fb7f7ded0d750ce9deb7e
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: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: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 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: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: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: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: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: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: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: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:05:21 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ibad2e367e7b86df59e5be5c5db6f2165f07fadb9
The Android Automerger [Thu, 11 Oct 2012 14:03:54 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Wed, 10 Oct 2012 23:36:08 +0000 (16:36 -0700)]
am
abc55c69: AudioPolicyManager supports querying active record sources
* commit '
abc55c698301e05a80d7f9394c75abca0b307602':
AudioPolicyManager supports querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 19:39:04 +0000 (12:39 -0700)]
AudioPolicyManager supports querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug
7314859
Change-Id: I8894845b176241134870af5df2bebc5ef27e4de4
The Android Open Source Project [Wed, 10 Oct 2012 16:45:02 +0000 (09:45 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I7ba72441de3b5c1aa8264e079a2808450036380a
The Android Automerger [Wed, 10 Oct 2012 15:55:57 +0000 (08:55 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:23 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Mon, 8 Oct 2012 22:53:09 +0000 (15:53 -0700)]
audio policy: add forced uses for system
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService by means of new forced use type
AUDIO_POLICY_FORCE_FOR_SYSTEM with config
AUDIO_POLICY_FORCE_SYSTEM_ENFORCED.
Property ro.camera.sound.forced is not used anymore.
Bug
7032634.
Change-Id: I742b0eebbe6b013f61d199846454a06411b52bc8
Mathias Agopian [Mon, 1 Oct 2012 21:53:18 +0000 (14:53 -0700)]
fix a typo in uevent_next_eventi
Bug:
7114973
Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2
Eric Laurent [Thu, 27 Sep 2012 01:50:09 +0000 (18:50 -0700)]
audio policy: force device update if disconnected
Force the new device selection to be applied when a device is disconnected
even if none is select. This is to indicate to the audio HAL that current
device selection is not valid anymore even if no new device is selected because
no audio track is active.
Bug
7141149.
Change-Id: Iade02fb53a4cc2051fce9da07870c5391396b696
Eric Laurent [Tue, 25 Sep 2012 23:52:22 +0000 (16:52 -0700)]
audio policy: fix crash when closing HDMI output
When a direct output is closed, the vector containing
the previously opened outputs must also be updated.
Bug
7157451.
Change-Id: I575b1f4928cf7527a4a98632fdec7600664a1e1c
Jean-Baptiste Queru [Thu, 20 Sep 2012 23:17:28 +0000 (16:17 -0700)]
am
e0232039: Merge "Restore the ability to use ctrl_interface directory"
* commit '
e0232039e0a59f7ef4fc67dad178387b2d5fffba':
Restore the ability to use ctrl_interface directory
Jean-Baptiste Queru [Thu, 20 Sep 2012 22:51:37 +0000 (15:51 -0700)]
Merge "Restore the ability to use ctrl_interface directory"
Jean-Michel Trivi [Mon, 17 Sep 2012 20:40:35 +0000 (13:40 -0700)]
Support audio recording while remote submix is active
When evaluating if an audio record is active, do not count inputs
opened on "virtual" devices, such as remote submix, as active.
Change-Id: If19c321cf673e3bdf4c3f81e73c163190df7c21e
Eric Laurent [Tue, 28 Aug 2012 21:32:21 +0000 (14:32 -0700)]
audio: new audio devices enums
Changes for new audio devices enums:
- legacy audio HAL wrapper provides conversion between new and
old device enums. It exposes a rev 2.0 audio device API to the
audio framework and allow legacy implementation to use old device enums.
- AudioPolicyManager: use standard enum value for no device (0).
Change-Id: I855d72291d672cdd8a6641bedb228634a54b7d9d
Jean-Michel Trivi [Mon, 20 Aug 2012 21:40:08 +0000 (14:40 -0700)]
Update Audio Policy Manager for remote submix
Define a new forced mode to route media to remote submix.
Update media routing rules according to mode.
Modify device connection management for remote submix.
Note that this CL doesn't implement changes to not prevent audio
recording when WFD is on, as audio recording is currently limited
to one input.
Change-Id: I458fe1802705da2d091ff82e536dc3e7f092f291
Eric Laurent [Thu, 6 Sep 2012 01:13:06 +0000 (18:13 -0700)]
audio policy: fix ringtone volume on headphones
When limiting ringtone volume because headphones are connected
and music is playing, the volume was not limited against the right
music volume. The is because the device used for music (headphone)
is not the same as the one used for ringtone (headphone + speaker).
Bug
6816207.
Change-Id: I3342be1789a1b7c58705812335b788f030bc6d76
Jean-Michel Trivi [Fri, 24 Aug 2012 18:45:04 +0000 (11:45 -0700)]
Update AudioPolicyManagerBase to only use audio_devices_t
The AudioPolicyManagerBase implementation was using some device
enum values from AudioSystemLegacy.h, of type audio_devices,
and some from /system/audio.h, of type audio_devices_t.
Now only uses audio_devices_t, and associated functions to
inspect what audio device type they correspond to.
Added #define to represent "no audio device" to clarify code.
Removed unused variable in AudioPolicyManagerBase::startOutput()
Change-Id: Ibec311dac550d6a806397377206a43bc708914c0
Paul Drews [Tue, 24 Jul 2012 23:17:53 +0000 (16:17 -0700)]
Restore the ability to use ctrl_interface directory
lihardware_legacy was ALWAYS re-writing the
wpa_supplicant.conf file's "ctrl_interface" entry to the
value specified as the property wifi.interface, whose value
was typically "wlan0". This was designed to allow the
wpa_supplicant service to be started with a "socket"
directive in its service description in an init.rc file.
Under these circumstances, the socket name is exchanged
between wpa_supplicant and its WifiService client through an
environment variable whose name is derived from
wifi.interface and a standard prefix.
However, since the "ctrl_interface" entry was always
re-written in this way, it broke the ability to use
"ctrl_interface" in its standard usage as a directory where
the (unix-domain) socket will be exchanged.
This change restores the ability to use the standard
directory-form ctrl_interface usage by limiting the
re-writing of the ctrl_interface entry to cases where it
does not look like an absolute path or the "DIR=" form of
directory.
Change-Id: I96c8656d144c1ea41e25ab0eb0807f7b49193b49
Signed-off-by: Paul Drews <paul.drews@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Jean-Michel Trivi [Tue, 21 Aug 2012 00:02:39 +0000 (17:02 -0700)]
Remove unused member variables in AudioPolicyManagerBase
The fields for the lists of input and output IOProfile are
not used in the AudioPolicyManagerBase class. Those are
actually stored inside each HwModule instance.
Change-Id: Iebb9fa5b7599a74013fd785a87de692890a89758
Glenn Kasten [Tue, 24 Jul 2012 14:51:26 +0000 (07:51 -0700)]
effect_descriptor_t const correctness
Change-Id: I734155d4cebb22b180f25290332c7c48be1e2b36
Glenn Kasten [Tue, 26 Jun 2012 00:28:38 +0000 (17:28 -0700)]
Merge "Use audio_channel_mask_t consistently"
Eric Laurent [Thu, 21 Jun 2012 16:55:49 +0000 (09:55 -0700)]
audio policy: fix HDMI hot plug
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
Glenn Kasten [Tue, 19 Jun 2012 19:29:39 +0000 (12:29 -0700)]
Use audio_channel_mask_t consistently
Change-Id: I0a274ab9f30a9380bc00eae69988224721fea177
The Android Open Source Project [Tue, 19 Jun 2012 13:13:45 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I2c7b504ccf7c3d9f7d0b17824f228c1a9ed87a0d
Eric Laurent [Wed, 13 Jun 2012 22:19:32 +0000 (15:19 -0700)]
audio policy: fix volume upon A2DP connection
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
Eric Laurent [Thu, 14 Jun 2012 15:41:07 +0000 (08:41 -0700)]
am
4366b4a6: audio policy: fix volume upon A2DP connection
* commit '
4366b4a6735e5da342b56773073f0b41197c777f':
audio policy: fix volume upon A2DP connection
Eric Laurent [Wed, 13 Jun 2012 22:19:32 +0000 (15:19 -0700)]
audio policy: fix volume upon A2DP connection
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
The Android Open Source Project [Mon, 11 Jun 2012 16:22:36 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: Ia53e5d26bd13718633bfe4931243ee2d9b1bdb6f
The Android Automerger [Fri, 8 Jun 2012 15:20:44 +0000 (08:20 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Michel Trivi [Thu, 7 Jun 2012 23:34:37 +0000 (16:34 -0700)]
am
e3ce4e99: Merge "Increase system stream volume on speaker" into jb-dev
* commit '
e3ce4e99970bd2820f91345b769e6f57353e02f0':
Increase system stream volume on speaker
Jean-Michel Trivi [Thu, 7 Jun 2012 22:29:09 +0000 (15:29 -0700)]
Merge "Increase system stream volume on speaker" into jb-dev
Eric Laurent [Thu, 7 Jun 2012 16:12:34 +0000 (09:12 -0700)]
am
5568b826: Merge "audio policy: fix notification volume limitation" into jb-dev
* commit '
5568b826b6b9b084f76b777db8b0411c7565e870':
audio policy: fix notification volume limitation
Eric Laurent [Thu, 7 Jun 2012 16:12:33 +0000 (09:12 -0700)]
am
fa3697d7: audio policy: remove delay when enabling speaker
* commit '
fa3697d716b444bbea6be480801536c44bf69214':
audio policy: remove delay when enabling speaker
Eric Laurent [Thu, 7 Jun 2012 16:10:26 +0000 (09:10 -0700)]
Merge "audio policy: fix notification volume limitation" into jb-dev
The Android Open Source Project [Thu, 7 Jun 2012 14:51:02 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: Iee868b6fbd8dda16cb70e4ea22d5a49ee927f3ce