summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | audio: allow compiling for 64-bitColin Cross2014-04-182-16/+19
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few 64-bit warnings and set -Wno-unused-parameter, which makes the directory warnings-clean on 32-bit and 64-bit. Remove LOCAL_32_BIT_ONLY. Change-Id: I688b31683f1a6598419866d9b7b6bc27a7056f4a
* | | | | | | Merge "wifi: Sync with wpa_supplicant commit 7dba0e5 (bacb984)"Dmitry Shmidt2014-04-141-1/+5
|\ \ \ \ \ \ \
| * | | | | | | wifi: Sync with wpa_supplicant commit 7dba0e5 (bacb984)Dmitry Shmidt2014-04-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f40c47c6388174b8ad09d089fe8a8aab2e67ca4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | Initial implementation of USB Audio output.Paul McLean2014-03-281-73/+85
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e2517233487ca7487ed7948a974fc2cc6c41190
* | | | | | | am fa8ad9fb: am 60089828: Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'fa8ad9fb544e01e663709e8dccd9b358e4d3ede9': Audio policy is 32-bit only
| * | | | | | am 60089828: Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '600898287d579c41b77af309f0ab75dbe40c559b': Audio policy is 32-bit only
| | * | | | | Merge "Audio policy is 32-bit only"Glenn Kasten2014-03-171-0/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Audio policy is 32-bit onlyGlenn Kasten2014-03-171-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I2eca0286d98bb5eebe9c68286d4ee7ed366f173d
* | | | | | am e6c7127e: am be39c1e4: Merge "audio policy : add ↵Glenn Kasten2014-03-171-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable" * commit 'e6c7127ef2491ddeb995ffb48843fda4e30ff9ff': audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
| * | | | | am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to ↵Glenn Kasten2014-03-171-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sDeviceNameToEnumTable" * commit 'be39c1e4cc6b635013553684953d1048d1599a8e': audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
| | * | | | Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"Glenn Kasten2014-03-171-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTablePeter Yoon2014-03-171-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am bfad19d2: am eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bfad19d2a12d0cc25ad74a58fe6838b0afe45776': Wi-Fi HAL: fix supplicant start failed issue
| * | | | am eaf44380: Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'eaf44380422a9d78b0a56a05ab3742dbeee79dd5': Wi-Fi HAL: fix supplicant start failed issue
| | * | | Merge "Wi-Fi HAL: fix supplicant start failed issue"Narayan Kamath2014-03-171-6/+10
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Wi-Fi HAL: fix supplicant start failed issuejiaguo2014-03-131-6/+10
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Add more PCM formats to audio_policy.conf parserGlenn Kasten2014-03-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | In particular, we need AUDIO_FORMAT_PCM_24_BIT_PACKED. Change-Id: I28abe8466024bdd4d1edbb4281c6472d45a2d94f
* | | | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-284-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | And simplify by removing the unused I/O handle parameter 'output'. Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
* | | | am e5a16307: am c32be36f: Merge "wifi: check if supplicant is running before ↵Dmitry Shmidt2014-02-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | starting it" * commit 'e5a16307ab7fdee029ea1fe0bfacd856f948b112': wifi: check if supplicant is running before starting it
| * | | am c32be36f: Merge "wifi: check if supplicant is running before starting it"Dmitry Shmidt2014-02-241-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit 'c32be36fd0981685cc9c33d32ae9babc466e6ae2': wifi: check if supplicant is running before starting it
| | * Merge "wifi: check if supplicant is running before starting it"Dmitry Shmidt2014-02-241-1/+1
| | |\
| | | * wifi: check if supplicant is running before starting itJonathan DE CESCO2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | wifi: Sync with wpa_supplicant commit bd14a57Dmitry Shmidt2014-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I17f5ff7c53b642c163c5ca25b0f075b112469004 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | audio_policy: clean up dumpsysPatrick Tjin2014-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Remove NUL characters from audio_policy's dump output Change-Id: If591473dbe3e5adbc34dbbdb0d552b329f19eb6a
* | | | am 3582b9b0: am 84b5cd7c: Merge "hardware/libhardware_legacy: convert ↵Colin Cross2014-01-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" * commit '3582b9b0e1caa4a43b8706e699903142e34ad5c0': hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| * | | am 84b5cd7c: Merge "hardware/libhardware_legacy: convert LOCAL_MODULE_PATH ↵Colin Cross2014-01-281-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | to LOCAL_MODULE_RELATIVE_PATH" * commit '84b5cd7cded812398aaef8274ecacf0c3bd1907e': hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| | * | Merge "hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to ↵Colin Cross2014-01-281-1/+1
| | |\ \ | | | | | | | | | | | | | | | LOCAL_MODULE_RELATIVE_PATH"
| | | * | hardware/libhardware_legacy: convert LOCAL_MODULE_PATH to ↵Colin Cross2014-01-241-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_MODULE_RELATIVE_PATH LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | | | audio policy: send config params when opening outputEric Laurent2014-01-082-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Continued cleanup of audio policy's use of audio_format_tGlenn Kasten2013-12-201-15/+15
| | | | | | | | | | | | | | | | Change-Id: I6ef6ec50cd5e0e751dc5063af1f7d8882588a89b
* | | | Use audio_channel_mask_t in AudioPolicyGlenn Kasten2013-12-163-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Use audio_format_t in AudioPolicyGlenn Kasten2013-12-104-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | Also remove unnecessary default parameters Change-Id: I553c01a98b8c2a3f3fd2ac98724aded3ad3c3022
* | | | am 65061e47: am cf68701c: Merge commit ↵The Android Open Source Project2013-12-060-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | \'9d3950389b53452338fab25f2255623ac159b259\' into HEAD * commit '65061e479a400353d2048fb5b4ee74db7dabecef':
| * | | am cf68701c: Merge commit \'9d3950389b53452338fab25f2255623ac159b259\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\ \ \ | | |/ / | | | | | | | | * commit 'cf68701c3952cc2e6e258005e3cf9e38fe107ede':
| | * | Merge commit '9d3950389b53452338fab25f2255623ac159b259' into HEADThe Android Open Source Project2013-12-053-8/+83
| | |\ \
* | | \ \ am cedd2862: am b8fada87: Merge "wifi: Link libwpa_client only if ↵Ying Wang2013-12-050-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | wpa_supplicant was chosen" * commit 'cedd28629f4987db1bded707cab21208fe7cea2d': wifi: Link libwpa_client only if wpa_supplicant was chosen
| * | | | am b8fada87: Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"Ying Wang2013-12-053-7/+29
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'b8fada8742caed088c4d9f18353c557255701d2f': wifi: Link libwpa_client only if wpa_supplicant was chosen
| | * | | Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"Ying Wang2013-12-053-7/+29
| | |\ \ \
| | | * | | wifi: Link libwpa_client only if wpa_supplicant was chosenDmitry Shmidt2013-12-053-7/+29
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ic487c3767a17299880e83080b79a91dbbaef1234 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"Dmitry Shmidt2013-11-253-7/+29
|\ \ \ \ \
| * | | | | wifi: Link libwpa_client only if wpa_supplicant was chosenDmitry Shmidt2013-11-223-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic487c3767a17299880e83080b79a91dbbaef1234 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | am c191f678: am 3c2559ea: Merge commit ↵The Android Open Source Project2013-11-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | \'c0ff7762509131a5a95ee258fa6da881a23100a6\' into HEAD * commit 'c191f678febc976016b83b54783b49332eada45c':
| * | | | | am 3c2559ea: Merge commit \'c0ff7762509131a5a95ee258fa6da881a23100a6\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | | * commit '3c2559ea1672acfa17e64bfece1cc3c2dcd636aa':
| | * | | Merge commit 'c0ff7762509131a5a95ee258fa6da881a23100a6' into HEADThe Android Open Source Project2013-11-2214-315/+652
| | |\ \ \
* | | | | | Fix typos in logsGlenn Kasten2013-11-221-6/+6
| |_|_|/ / |/| | | | | | | | | | | | | | Change-Id: Ie2e49d108a4dd33725296c96aaf9458585b81d32
* | | | | wifi: Sync with wpa_supplicant commit 107a894Dmitry Shmidt2013-11-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ed9eb6e8dda10600c150a1cade55dc7547cc7e4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | am 9d395038: am 18fc094c: Define and use DRC-specific volume curves when ↵Jean-Michel Trivi2013-11-153-3/+41
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | applicable * commit '9d3950389b53452338fab25f2255623ac159b259': Define and use DRC-specific volume curves when applicable
| * | | | am 18fc094c: Define and use DRC-specific volume curves when applicableJean-Michel Trivi2013-11-153-3/+41
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '18fc094c0ed41851be3d746423c6695dd28d48e1': Define and use DRC-specific volume curves when applicable
| | * | | | Define and use DRC-specific volume curves when applicableJean-Michel Trivi2013-11-143-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am a8809cd0: am 376356d4: Merge "audio: do not use GNU old-style field ↵Nick Kralevich2013-11-061-12/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | designators" * commit 'a8809cd0685ef489f770e6bdc197d4f714fee9ce': audio: do not use GNU old-style field designators