OSDN Git Service
Glenn Kasten [Mon, 17 Mar 2014 15:56:18 +0000 (15:56 +0000)]
am
e6c7127e: am
be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"
* commit '
e6c7127ef2491ddeb995ffb48843fda4e30ff9ff':
audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
Narayan Kamath [Mon, 17 Mar 2014 15:56:17 +0000 (15:56 +0000)]
am
bfad19d2: am
eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"
* commit '
bfad19d2a12d0cc25ad74a58fe6838b0afe45776':
Wi-Fi HAL: fix supplicant start failed issue
Glenn Kasten [Mon, 17 Mar 2014 15:50:23 +0000 (15:50 +0000)]
am
be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"
* commit '
be39c1e4cc6b635013553684953d1048d1599a8e':
audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
Narayan Kamath [Mon, 17 Mar 2014 15:50:22 +0000 (15:50 +0000)]
am
eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"
* commit '
eaf44380422a9d78b0a56a05ab3742dbeee79dd5':
Wi-Fi HAL: fix supplicant start failed issue
Glenn Kasten [Mon, 17 Mar 2014 14:41:05 +0000 (14:41 +0000)]
Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"
Peter Yoon [Wed, 11 Sep 2013 08:45:09 +0000 (17:45 +0900)]
audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
This commit adds AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable[],
It had to be added here, when it was defined in system/core/include/system/audio.h
AudioPolicyManagerBase::loadHwModule() fails to parse device type of
AUDIO_DEVICE_IN_USB_DEVICE in audio_policy.conf.
By applying this commit, AUDIO_DEVICE_IN_USB_DEVICE can be used for
audio policy customization.
Change-Id: I0165956334d7105129dca4c746372dbca0d9e324
Narayan Kamath [Mon, 17 Mar 2014 09:39:58 +0000 (09:39 +0000)]
Merge "Wi-Fi HAL: fix supplicant start failed issue"
jiaguo [Thu, 13 Mar 2014 10:49:14 +0000 (18:49 +0800)]
Wi-Fi HAL: fix supplicant start failed issue
init.svc.*(hostapd, p2p_supplicant) properties are set when starting
STA or uAP via Wi-Fi HAL, after sending ctrl.start command to
property_service, thread called wifi_start_supplicant will yield cpu
for android init process to get scheduled, then init.svc.* status
is read to check if supplicant status is running
there is a chance that after scheld_yield returned, init is not
scheduled, serial value is not updated, __system_property_read got
the "stopped" status, then init is scheduled to update service status
after that back to this loop in Wi-Fi HAL, serial is updated, but
status is not reread, still used "stopped", then Wi-Fi HAL will
report supplicant start failed
as the following schedule sequence:
process A(WifiStateMachine) process B(init)
1. ctl.start
2. scheld_yield
3. __system_proerty_read
/*serial1, value1*/
4. __system_property_update
/*serial2, value2*/
5. serial1 != serial2
6. value1 == "stopped"
So after sched_yield, first check if serial is updated, then read
service status
Change-Id: I5181e0d4504c525832c033b9a35bd58ec63e1de8
Signed-off-by: jiaguo <jiaguo@marvell.com>
Glenn Kasten [Fri, 7 Mar 2014 18:17:36 +0000 (10:17 -0800)]
Add more PCM formats to audio_policy.conf parser
In particular, we need AUDIO_FORMAT_PCM_24_BIT_PACKED.
Change-Id: I28abe8466024bdd4d1edbb4281c6472d45a2d94f
Glenn Kasten [Mon, 3 Feb 2014 16:46:13 +0000 (08:46 -0800)]
Rename setStreamOutput to invalidateStream
And simplify by removing the unused I/O handle parameter 'output'.
Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
Dmitry Shmidt [Mon, 24 Feb 2014 18:31:07 +0000 (18:31 +0000)]
am
e5a16307: am
c32be36f: Merge "wifi: check if supplicant is running before starting it"
* commit '
e5a16307ab7fdee029ea1fe0bfacd856f948b112':
wifi: check if supplicant is running before starting it
Dmitry Shmidt [Mon, 24 Feb 2014 18:23:18 +0000 (18:23 +0000)]
am
c32be36f: Merge "wifi: check if supplicant is running before starting it"
* commit '
c32be36fd0981685cc9c33d32ae9babc466e6ae2':
wifi: check if supplicant is running before starting it
Dmitry Shmidt [Mon, 24 Feb 2014 18:17:01 +0000 (18:17 +0000)]
Merge "wifi: check if supplicant is running before starting it"
Dmitry Shmidt [Tue, 18 Feb 2014 23:48:20 +0000 (15:48 -0800)]
wifi: Sync with wpa_supplicant commit
bd14a57
Change-Id: I17f5ff7c53b642c163c5ca25b0f075b112469004
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Patrick Tjin [Thu, 6 Feb 2014 00:03:30 +0000 (16:03 -0800)]
audio_policy: clean up dumpsys
Remove NUL characters from audio_policy's dump output
Change-Id: If591473dbe3e5adbc34dbbdb0d552b329f19eb6a
Colin Cross [Tue, 28 Jan 2014 01:12:46 +0000 (01:12 +0000)]
am
3582b9b0: am
84b5cd7c: Merge "hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
3582b9b0e1caa4a43b8706e699903142e34ad5c0':
hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:55:35 +0000 (00:55 +0000)]
am
84b5cd7c: Merge "hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
84b5cd7cded812398aaef8274ecacf0c3bd1907e':
hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:46:14 +0000 (00:46 +0000)]
Merge "hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Eric Laurent [Mon, 6 Jan 2014 18:04:43 +0000 (10:04 -0800)]
audio policy: send config params when opening output
When a new output stream is opened upon device connection,
always send mandatory configuration parameters
(A2DP device address, ALSA card and device number etc...)
immediately after opening the output.
Change-Id: Id1fc1d99d3b30e2ef907dcb231a6a9e70560ecae
Glenn Kasten [Fri, 20 Dec 2013 17:59:24 +0000 (09:59 -0800)]
Continued cleanup of audio policy's use of audio_format_t
Change-Id: I6ef6ec50cd5e0e751dc5063af1f7d8882588a89b
Glenn Kasten [Tue, 10 Dec 2013 17:10:28 +0000 (09:10 -0800)]
Use audio_channel_mask_t in AudioPolicy
Also:
- use %x format for logging channel masks
- use AUDIO_CHANNEL_IN_* constants from system/audio.h instead of AudioSystemLegacy.h symbols
- remove redundant casts
- use "channelMask" instead of "channels" to avoid possible confusion with channel counts
Change-Id: If05d6b1cae5cf1b560cd53a93ae9e592b719ec9e
Glenn Kasten [Tue, 10 Dec 2013 17:53:22 +0000 (09:53 -0800)]
Use audio_format_t in AudioPolicy
Also remove unnecessary default parameters
Change-Id: I553c01a98b8c2a3f3fd2ac98724aded3ad3c3022
The Android Open Source Project [Fri, 6 Dec 2013 02:50:55 +0000 (02:50 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:27:54 +0000 (17:27 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)]
Ying Wang [Thu, 5 Dec 2013 20:28:35 +0000 (20:28 +0000)]
am
cedd2862: am
b8fada87: Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"
* commit '
cedd28629f4987db1bded707cab21208fe7cea2d':
wifi: Link libwpa_client only if wpa_supplicant was chosen
Ying Wang [Thu, 5 Dec 2013 19:18:39 +0000 (11:18 -0800)]
am
b8fada87: Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"
* commit '
b8fada8742caed088c4d9f18353c557255701d2f':
wifi: Link libwpa_client only if wpa_supplicant was chosen
Ying Wang [Thu, 5 Dec 2013 19:13:04 +0000 (19:13 +0000)]
Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"
Dmitry Shmidt [Fri, 22 Nov 2013 23:54:27 +0000 (15:54 -0800)]
wifi: Link libwpa_client only if wpa_supplicant was chosen
Change-Id: Ic487c3767a17299880e83080b79a91dbbaef1234
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Mon, 25 Nov 2013 17:41:07 +0000 (17:41 +0000)]
Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"
The Android Open Source Project [Sat, 23 Nov 2013 03:31:11 +0000 (19:31 -0800)]
The Android Open Source Project [Sat, 23 Nov 2013 01:32:01 +0000 (17:32 -0800)]
Dmitry Shmidt [Fri, 22 Nov 2013 23:54:27 +0000 (15:54 -0800)]
wifi: Link libwpa_client only if wpa_supplicant was chosen
Change-Id: Ic487c3767a17299880e83080b79a91dbbaef1234
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Open Source Project [Fri, 22 Nov 2013 18:35:27 +0000 (10:35 -0800)]
Glenn Kasten [Fri, 22 Nov 2013 17:09:58 +0000 (09:09 -0800)]
Fix typos in logs
Change-Id: Ie2e49d108a4dd33725296c96aaf9458585b81d32
Dmitry Shmidt [Tue, 19 Nov 2013 21:19:30 +0000 (13:19 -0800)]
wifi: Sync with wpa_supplicant commit
107a894
Change-Id: I9ed9eb6e8dda10600c150a1cade55dc7547cc7e4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jean-Michel Trivi [Fri, 15 Nov 2013 17:08:16 +0000 (09:08 -0800)]
am
9d395038: am
18fc094c: Define and use DRC-specific volume curves when applicable
* commit '
9d3950389b53452338fab25f2255623ac159b259':
Define and use DRC-specific volume curves when applicable
Jean-Michel Trivi [Fri, 15 Nov 2013 17:04:54 +0000 (09:04 -0800)]
am
18fc094c: Define and use DRC-specific volume curves when applicable
* commit '
18fc094c0ed41851be3d746423c6695dd28d48e1':
Define and use DRC-specific volume curves when applicable
Jean-Michel Trivi [Fri, 15 Nov 2013 00:30:20 +0000 (16:30 -0800)]
Define and use DRC-specific volume curves when applicable
Add support for property defining whether a DRC on the speaker path
is enabled and will boost soft sounds.
Define new volume curves with more attenuations than existing ones
to compensate for DRC-induced boost on sonification sounds to
provide a more "linear" control to the user over the applied volume.
Bug
11600699
Change-Id: If23dd097a8b9b5ebb61e75dd8512ff75e63ba899
Nick Kralevich [Thu, 7 Nov 2013 03:30:51 +0000 (19:30 -0800)]
am
a8809cd0: am
376356d4: Merge "audio: do not use GNU old-style field designators"
* commit '
a8809cd0685ef489f770e6bdc197d4f714fee9ce':
audio: do not use GNU old-style field designators
Nick Kralevich [Thu, 7 Nov 2013 03:29:23 +0000 (19:29 -0800)]
am
376356d4: Merge "audio: do not use GNU old-style field designators"
* commit '
376356d4e0c135e710c6232e7e3f5c950247c848':
audio: do not use GNU old-style field designators
Nick Kralevich [Thu, 7 Nov 2013 03:24:59 +0000 (03:24 +0000)]
Merge "audio: do not use GNU old-style field designators"
synergy dev [Thu, 7 Nov 2013 01:04:01 +0000 (17:04 -0800)]
audio: do not use GNU old-style field designators
Avoiding the use of gnu extensions improves code portability
Change-Id: Ifa8f5d230de20a6284bb943c1ca3c48fd5fd5f2d
Elliott Hughes [Thu, 7 Nov 2013 01:45:36 +0000 (17:45 -0800)]
am
7e7add70: am
2c14d798: Merge "Revert "audio: do not use GNU old-style field designators""
* commit '
7e7add707a4bc5a2c32553434e6b8b898af28ccc':
Revert "audio: do not use GNU old-style field designators"
Elliott Hughes [Thu, 7 Nov 2013 01:41:31 +0000 (17:41 -0800)]
am
2c14d798: Merge "Revert "audio: do not use GNU old-style field designators""
* commit '
2c14d79895593d4f8e1241b522cd3ce2d7225aaf':
Revert "audio: do not use GNU old-style field designators"
Elliott Hughes [Thu, 7 Nov 2013 01:35:01 +0000 (01:35 +0000)]
Merge "Revert "audio: do not use GNU old-style field designators""
Elliott Hughes [Thu, 7 Nov 2013 01:34:47 +0000 (01:34 +0000)]
Revert "audio: do not use GNU old-style field designators"
This reverts commit
d2bd76e0dabdfbdd33265b68c6b519cce1d673c6.
Change-Id: I6fb884cd0e1efa0c792521b67ed193420f6929ba
Nick Kralevich [Thu, 7 Nov 2013 01:14:03 +0000 (17:14 -0800)]
am
e1ffc9aa: am
636ab7e2: Merge "audio: do not use GNU old-style field designators"
* commit '
e1ffc9aa462d53284fd1b788031592495957f7ec':
audio: do not use GNU old-style field designators
Nick Kralevich [Thu, 7 Nov 2013 01:10:53 +0000 (17:10 -0800)]
am
636ab7e2: Merge "audio: do not use GNU old-style field designators"
* commit '
636ab7e2dd52c3cdad575a49b952c1235d734240':
audio: do not use GNU old-style field designators
Nick Kralevich [Thu, 7 Nov 2013 01:07:03 +0000 (01:07 +0000)]
Merge "audio: do not use GNU old-style field designators"
synergy dev [Thu, 7 Nov 2013 01:04:01 +0000 (17:04 -0800)]
audio: do not use GNU old-style field designators
Avoiding the use of gnu extensions improves code portability
Change-Id: Ifa8f5d230de20a6284bb943c1ca3c48fd5fd5f2c
Eric Laurent [Wed, 30 Oct 2013 01:24:59 +0000 (18:24 -0700)]
am
758289be: Merge "audio policy: fix gapless playback when effects enabled" into klp-dev
* commit '
758289be1f05457db5dd4d29020cabd81efe66bb':
audio policy: fix gapless playback when effects enabled
Eric Laurent [Wed, 30 Oct 2013 01:17:47 +0000 (01:17 +0000)]
Merge "audio policy: fix gapless playback when effects enabled" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 01:01:58 +0000 (18:01 -0700)]
am
c0ff7762: merge in klp-release (no-op)
* commit '
c0ff7762509131a5a95ee258fa6da881a23100a6':
audio: fix remote submix sampling rates
Ed Heyl [Thu, 17 Oct 2013 00:43:55 +0000 (17:43 -0700)]
merge in klp-release (no-op)
Eric Laurent [Sat, 12 Oct 2013 23:29:39 +0000 (16:29 -0700)]
audio policy: fix gapless playback when effects enabled
Do not allow offloading if one non offloadable effect is enabled. This prevents from
creating an offloaded track and tearing it down immediately after start when audioflinger
detects there is an active non offloadable effect.
Not doing so breaks gapless playback because AwesomePlayer will always be able to open
an offloaded track which will not be compatible with the previous PCM track and
Audiosink::open() will not recycle it.
Bug:
11181933.
Change-Id: I6d163806849d9093b9ec701ba8e8c1ccb658e3c8
The Android Automerger [Tue, 8 Oct 2013 13:00:52 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Mon, 7 Oct 2013 18:39:14 +0000 (11:39 -0700)]
am
b40b96a7: audio policy: fix direct output selection
* commit '
b40b96a78537d63d801af7e706764c68acf8f182':
audio policy: fix direct output selection
Eric Laurent [Sun, 6 Oct 2013 19:39:32 +0000 (12:39 -0700)]
audio policy: fix direct output selection
commit
a527ffd broke the selection of an available
direct output profile in getProfileForDirectOutput().
getProfileForDirectOutput() should check for direct output profiles
regardless of the flags provided to getOutput().
Bug:
11051912.
Change-Id: I4a84734331bfed03d6024ea1c2e8776c27d0b28f
The Android Automerger [Sun, 6 Oct 2013 13:01:34 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Dmitry Shmidt [Fri, 4 Oct 2013 22:49:11 +0000 (15:49 -0700)]
wifi: Remove obsolete update_ctrl_interface() call
Change-Id: Ib57a87ae1ef5953b1ddcf43974b07f091f298e74
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 4 Oct 2013 19:02:05 +0000 (19:02 +0000)]
Merge "wifi: Sync with wpa_supplicant commit
5605286"
Dmitry Shmidt [Fri, 4 Oct 2013 18:04:45 +0000 (11:04 -0700)]
wifi: Sync with wpa_supplicant commit
5605286
Change-Id: I43713275612f612e9d73ad555cac30e056b3c85a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Fri, 4 Oct 2013 01:02:16 +0000 (18:02 -0700)]
audio policy: fix DTMF tones volume while in call
When voice call stream volume is at 0, DTMF are not heard at all.
DTMF volume should follow the behavior of voice call volume which
is never completely muted.
Bug:
10932676.
Change-Id: Iaf0e33284be75b00516a837907e66be3123e5331
The Android Automerger [Wed, 2 Oct 2013 13:01:21 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Tue, 1 Oct 2013 02:20:15 +0000 (19:20 -0700)]
remove audio HAL warning when inserting a headset
A valid offload info structure must be provided when
opening an offload output stream in checkOutputsForDevice()
upon headset insertion.
Bug:
8174034.
Change-Id: Id800a206536e5ce979febf89747a51db581c53b6
Eric Laurent [Thu, 26 Sep 2013 18:28:36 +0000 (11:28 -0700)]
audio: fix remote submix sampling rates
Only list 48000 Hz in supported sampling rates for remote submix
output and input stream profiles to avoid mismatch betwen playback
and capture.
Bug:
10900252.
Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
Eric Laurent [Thu, 26 Sep 2013 18:28:36 +0000 (11:28 -0700)]
audio: fix remote submix sampling rates
Only list 48000 Hz in supported sampling rates for remote submix
output and input stream profiles to avoid mismatch betwen playback
and capture.
Bug:
10900252.
Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
Eric Laurent [Fri, 13 Sep 2013 00:39:21 +0000 (17:39 -0700)]
audio policy: add support for audio effect offload
Add rules to select the appropriate output for global
effects.
Move global effects if needed when an offloaded output is
created or released.
Bug:
8174034.
Change-Id: I0bbd8e9f8aa717f672462dd74ba0d01eaef1fda7
Eric Laurent [Thu, 12 Sep 2013 00:15:03 +0000 (00:15 +0000)]
Merge "AudioPolicyManageBase changes to enable HOTWORD audio source" into klp-dev
Eric Laurent [Mon, 9 Sep 2013 17:42:47 +0000 (10:42 -0700)]
AudioPolicyManageBase changes to enable HOTWORD audio source
- This change enables HOTWORD audio source to be preempted by any other
audio source
Bug:
10640877.
Change-Id: I6f7acbe95a6521306db70ad73260d2ba7b38b940
Eric Laurent [Mon, 9 Sep 2013 20:24:05 +0000 (13:24 -0700)]
audio policy: extend min duration for offload
Extend minimun duration of offloaded audio content
to 1 minute to avoid offloading short clips like
TTS generated files.
Bug:
8174034.
Change-Id: Ied21557c300af4b27d99388e069576e36804087f
Eric Laurent [Fri, 30 Aug 2013 22:47:52 +0000 (15:47 -0700)]
audio policy: remove verbose logging.
Change-Id: I268935bd8f7e58f90c698c098686a04681b43887
Eric Laurent [Fri, 30 Aug 2013 00:29:19 +0000 (17:29 -0700)]
audio policy: disable audio offloading with video
Do not enable offloading of audio decompression when
playing video.
Change-Id: I6ee8b59370219f5ef810a99a27ba4a1cf222b55b
Chong Zhang [Sat, 24 Aug 2013 23:44:47 +0000 (16:44 -0700)]
audio policy: allow virtual input even if there are active inputs
Bug:
10460751
Change-Id: Ic6fcd14162e9c6e03366d887063321e21fcf14cd
Jeff Brown [Sat, 17 Aug 2013 03:10:48 +0000 (20:10 -0700)]
Automatically enable/disable remote submix when input started.
When recording from the audio submix begins, enable the remote
audio submit output device. When it ends, disable it.
Bug:
10265163
Change-Id: Ia0dc2e20623bb834d06561469ce856688991243b
Vinit Deshapnde [Thu, 8 Aug 2013 17:39:25 +0000 (10:39 -0700)]
Use a single socket to communicate with supplicant
This helps to preapre for future updates from external sources.
Bug:
9298955
Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit
759cc323cb586192d591a815b0fb9d839536fcd6)
Richard Fitzgerald [Mon, 13 May 2013 10:52:24 +0000 (11:52 +0100)]
Code changes for audio offload support
- Share existing offload output if compatible instead of
creating a new one. Hardware has limited number of
offload channels (possible only 1) so we must use as
few as possible
- Changes to routing handling for offloaded outputs
Change-Id: I11111d8f504828595bd8dbf66444cbd1202e7192
Signed-off-by: Eric Laurent <elaurent@google.com>
The Android Open Source Project [Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)]
am
4c7db154: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
4c7db154564031237df705641f27d504d4ae3f11':
audio policy: apply default device volume
The Android Open Source Project [Tue, 16 Jul 2013 18:19:23 +0000 (11:19 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774
Eric Laurent [Mon, 15 Jul 2013 22:35:58 +0000 (15:35 -0700)]
audio policy: apply default device volume
Make sure that we apply default device volume to
active outputs in case no specific volume for selected
device is received afterward.
Bug:
9760269.
Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
Eric Laurent [Tue, 16 Jul 2013 00:26:21 +0000 (17:26 -0700)]
am
8e7e4254: am
e92d6238: audio policy: apply default device volume
* commit '
8e7e42547116b1d5f49118ba41946b2906ad3936':
audio policy: apply default device volume
Eric Laurent [Tue, 16 Jul 2013 00:23:36 +0000 (17:23 -0700)]
am
e92d6238: audio policy: apply default device volume
* commit '
e92d623811f3fd3e7cc5e5dd8bc93c0c0a8fdf50':
audio policy: apply default device volume
Eric Laurent [Mon, 15 Jul 2013 22:35:58 +0000 (15:35 -0700)]
audio policy: apply default device volume
Make sure that we apply default device volume to
active outputs in case no specific volume for selected
device is received afterward.
Bug:
9760269.
Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
Dmitry Shmidt [Fri, 12 Jul 2013 17:10:40 +0000 (10:10 -0700)]
wifi: Sync with wpa_supplicant commit
1075b29
Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Glenn Kasten [Tue, 2 Jul 2013 21:08:21 +0000 (14:08 -0700)]
Include header files used by this header
Change-Id: I36c6f580c698706b961150978e2124f9235eab12
Richard Fitzgerald [Mon, 25 Mar 2013 16:18:26 +0000 (16:18 +0000)]
Add audio policy API changes for audio offload
Changes to the API of audio policy for audio offload support:
- Add isOffloadSupported() function
- Add OUTPUT_FLAG_OFFLOAD
- Extend AudioOutputDescriptor to include a sharing count for direct outputs
- Pass audio_offload_info_t when opening output streams
Change-Id: I5ad26418fdb286eb7ae299d586dd1fd525d48ab9
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
Colin Cross [Tue, 18 Jun 2013 01:33:50 +0000 (18:33 -0700)]
am
248c9aa9: am
2769ce79: Merge "Use accessor to read property serial numbers"
* commit '
248c9aa92c8f3e2f33a0e8a02436ea366266495f':
Use accessor to read property serial numbers
Colin Cross [Tue, 18 Jun 2013 01:21:38 +0000 (18:21 -0700)]
am
2769ce79: Merge "Use accessor to read property serial numbers"
* commit '
2769ce79def80023e454708deec176e3259dc586':
Use accessor to read property serial numbers
Colin Cross [Tue, 18 Jun 2013 01:11:56 +0000 (01:11 +0000)]
Merge "Use accessor to read property serial numbers"
Colin Cross [Mon, 4 Feb 2013 20:34:20 +0000 (12:34 -0800)]
Use accessor to read property serial numbers
Hide the implementation of the property structures by using
an accessor.
(cherry picked from commit
14c02f245e56687b765487d25a034d71196d33b6)
Change-Id: Id86ff99d8430fa73bbc745aaa0ff2b7713ca7885
Colin Cross [Mon, 4 Feb 2013 20:34:20 +0000 (12:34 -0800)]
Use accessor to read property serial numbers
Hide the implementation of the property structures by using
an accessor.
Change-Id: Ic604935882f6085e3d082baa651bad9bafe0a54a
Dmitry Shmidt [Thu, 6 Jun 2013 23:51:59 +0000 (16:51 -0700)]
wifi: Move common file from wpa_supplicant_lib
Change-Id: I902f864da4317fd637fbc31036133c49a8ae0724
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 6 Jun 2013 17:45:48 +0000 (10:45 -0700)]
wifi: Skip adding interface prefix if exists
Bug:
9313188
Change-Id: I63784493c84ac4ffcc9810a7798b1c0de1b0f68b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 29 May 2013 17:34:39 +0000 (10:34 -0700)]
wifi: Use global control socket
Change-Id: I11e4438ec0b36575e1b5a563ac4da57303d028c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 30 May 2013 17:49:15 +0000 (10:49 -0700)]
wifi: Add command buffer length parameter to wifi_command()
Change-Id: I832bc51279e0fb7d3002298f87a35b816b666ad5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 22 May 2013 23:45:57 +0000 (16:45 -0700)]
wifi: Use wpa_ctrl_cleanup() function from wpa_supplicant
Change-Id: I24af9ec380e138f24864cd9359c6901b8b29e5ee
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Tue, 21 May 2013 15:55:38 +0000 (08:55 -0700)]
am
66707435: audio policy: fix device selection in startInput()
* commit '
66707435156d8d99d795271a7bd54943065b4c2d':
audio policy: fix device selection in startInput()
Eric Laurent [Fri, 17 May 2013 21:11:27 +0000 (14:11 -0700)]
audio policy: fix device selection in startInput()
Check again input device selection when capture starts in case
conditions have changed since the input stream was opened.
This is related to but does not fix issue
8761558. It makes the
selection of BT SCO device consistent.
Bug:
8761558
Change-Id: I386b638e9c3238711e16fb848449af561624359e