summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31lineage-17.1Luca Stefani2020-03-072-19/+7
|\ | | | | | | | | | | | | | | | | | | | | Android 10.0.0 release 31 * tag 'android-10.0.0_r31': audio: free and assign NULL to global static device pointer post_proc: release vol listener object based on context audio: free and assign NULL to global static device pointer Change-Id: Ie4f5f97dcba429e6133f8c1c4c6b3538d1a9c8d3
| * Snap for 6117658 from aa0557714885b9e99cec54fd30a16cef5f696d85 to ↵android-build-team Robot2020-01-081-18/+3
| |\ | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: If41eefd19ded38321c7af43ca214bcdd816c0146
| | * Merge "post_proc: release vol listener object based on context" into qt-qpr1-devTreeHugger Robot2020-01-071-18/+3
| | |\
| | | * post_proc: release vol listener object based on contextAniket Kumar Lata2019-11-251-18/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Releasing volume listener object based on session_id and stream type is not accurate, which results into false free and dangling pointer. Release volume listener object based on context. Bug: 123583662 Test: manual Change-Id: I335d064059f1b3e951567af2a40f7a1177df169c
| * | | Snap for 6055731 from 506fd42a89494c836eda69df354177affa0820f8 to ↵android-build-team Robot2019-12-071-5/+4
| |\| | | | | | | | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: Ib2b29116e660e856772b3562e667a223fd06fd38
| | * | audio: free and assign NULL to global static device pointerAniket Kumar Lata2019-11-261-5/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Free and assign NULL to global static device pointer instead of local pointer to avoid free after use issue. Bug: 144583303 Signed-off-by: Harrison Lingren <hlingren@google.com> Change-Id: Idfdef719320efcd792c7d2ebd7ec2dfe5d3fbfbd
| * | Snap for 6013205 from 73d6b59977595c1d0a222a1656f298e7991e43b9 to ↵android-build-team Robot2019-11-171-2/+2
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: Iff21574beecab30cf178551e037d60b92d3bdd09
| | * audio: free and assign NULL to global static device pointerCarter Hsu2019-11-151-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | From: Preetam Singh Ranawat <apranawat@codeaurora.org> Date: Mon, 24 Jun 2019 15:11:28 +0530 Subject: audio: free and assign NULL to global static device pointer -free and assign NULL to global static device pointer instead of local pointer to avoid use after free issue. Bug: 142267478 Test: manual Change-Id: I6f64fe0f6034844279c9a481726426dc5b989b41
* | msm8960: Add two stub microphone functionsArtem Borisov2020-01-131-0/+10
| | | | | | | | | | | | | | | | platform_set_microphone_map and platform_set_mic_break_det are called in the common HAL code, so we should have them to avoid build errors. Change-Id: I666d721cd5f1fed9e7efdf4fbf4baf5fb6a04063
* | msm8960: Add SND_DEVICE_OUT_VOICE_MUSIC_TXvoron002020-01-132-0/+3
| | | | | | | | | | | | | | Commit 66c4ecfa84116e12c5cb3b430208365cdfb0b2c9 introduced SND_DEVICE_OUT_VOICE_MUSIC_TX which wasn't added to a 8960 platform. Change-Id: I2748c9030e719ce8cdfac6ff7cc4debdcb0bd64f
* | msm8960: Add some missing out/in typesArtem Borisov2020-01-131-0/+3
| | | | | | | | Change-Id: I2932b1250ab2da98fb3670706b222d1974290294
* | msm8960: treblize configurationArtem Borisov2020-01-131-2/+26
| | | | | | | | | | | | Loosely based on f62e17dbf9e88eae1371b42c59a8f48b736abb8a Change-Id: I63e873b743d2de85d6c44491bf2aed4c8e41e0e5
* | Merge tag 'android-10.0.0_r23' into ↵Michael Bestas2020-01-081-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-17.1_merge-android-10.0.0_r23 Android 10.0.0 release 23 * tag 'android-10.0.0_r23': audio: free and assign NULL to global static device pointer Change-Id: Ib07c17230f97f54746d3713c3137a04ca9428194
| * \ Merge cherrypicks of [9739231, 9739679, 9739582, 9739066] into qt-qpr1-b-releaseandroid-build-team Robot2019-11-151-2/+2
| |\ \ | | | | | | | | | | | | Change-Id: Id70cb6a90b3aad2e0da0fef979bff291d96d8d3f
| | * | audio: free and assign NULL to global static device pointerCarter Hsu2019-11-151-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Preetam Singh Ranawat <apranawat@codeaurora.org> Date: Mon, 24 Jun 2019 15:11:28 +0530 Subject: audio: free and assign NULL to global static device pointer -free and assign NULL to global static device pointer instead of local pointer to avoid use after free issue. Bug: 142267478 Test: manual Change-Id: I6f64fe0f6034844279c9a481726426dc5b989b41 (cherry picked from commit 73d6b59977595c1d0a222a1656f298e7991e43b9)
* | | Revert "msm8x74: remove from top level makefile"staging/lineage-17.0_merge-android-10.0.0_r9Chirayu Desai2019-12-111-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 1c9849ca9873ec815caf52935aa772b22658219e. Change-Id: I5ba7e814ead8467f0b7e5928e22ed73fc7848b8b
* | | audio: Make CVD version retrieval nonfatal with ACDB v1D. Andrei Măceș2019-12-111-1/+8
| | | | | | | | | | | | | | | | | | | | | This information is only needed at the initialization of ACDB v[23]. Change-Id: I5bbd99d661c55ca623cbe8fb56b54f29888de47c Signed-off-by: D. Andrei Măceș <andrei@unlegacy-android.org>
* | | audio: Use generated kernel headersrazorloves2019-12-112-0/+11
|/ / | | | | | | Change-Id: I0a7775ceda07b9090a7ea04e389559d32fbb3618
* | Snap for 5811135 from d9ec40cbfe00cdf6b77eb6deb8cde14f93b8beac to ↵android-build-team Robot2019-08-175-8/+21
|\| | | | | | | | | | | qt-qpr1-release Change-Id: I7f05ed7613dbf7675d4f7159f4f8da5441bfdf01
| * Fix incorrect sysprop nameJiyong Park2019-08-152-2/+6
| |\ | | | | | | | | | | | | | | | am: 96ad71a970 Change-Id: Ia9b2c61281e86637f51c52365b9eb0db5cad0c1b
| | * Fix incorrect sysprop nameJiyong Park2019-08-092-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting from Q-launching devices, sysprops defined by vendor should start with vendor. or ro.vendor. Therefore, renaming ro.qc.sdk.audio.fluencetype to ro.vendor.audio.sdk.fluencetype. For legacy compatibility, the HAL reads both sysprops; first the new one and then falls back to the old one. Bug: 139108926 Test: making a video call via Duo, make sure sound works Test: vol adjust during a phone call works Change-Id: I54babf96de702a142cbe860f59d6b5b011bfa374
| * | Revert "Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops""Jiyong Park2019-08-153-6/+15
| |\| | | | | | | | | | | | | | | | am: aac4984dc1 Change-Id: I64ad153132df3f11c4e119d34257e468829485e3
| | * Revert "Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops""Jiyong Park2019-08-093-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 25054b7a665f02f441169353514116fa9d772953. Bug: 139108926 Test: making a video call via Duo, make sure sound works Test: vol adjust during a phone call works Change-Id: Iea2371c79aa8061009a4f26f0574f1e1ea5742c9
* | | Snap for 5794870 from c22b4fc5c4ad5311af164aca6205d18247b5baa3 to ↵android-build-team Robot2019-08-103-15/+6
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Id6cbf12b6fb3545bf7cbb5c5ce51f78a67d30611
| * | Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops"Andrew Chant2019-08-083-15/+6
| |\| | | | | | | | | | | | | | | | am: 25054b7a66 Change-Id: Iec1540012205b0ec722d5f03403ff8c9fcc61766
| | * Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops"Andrew Chant2019-08-083-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 83fde0ec25e15f4aa94deae1e53738c2fe039775. Reason for revert: No vol adjust on calls No audio in duo vid calls. Bug: 139108926 Change-Id: I21a6f81d1880251fd5bf9269363fbfda59674fd3
* | | Snap for 5787825 from 60fd1e1899504cb0de937d3900ba9da8f9640326 to ↵android-build-team Robot2019-08-083-6/+15
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ifdf2f97aebd2301c734b8d7bc5b7e13d8724b49b
| * | Read both vendor.audio_hal.* and audio_hal.* syspropsJiyong Park2019-08-063-6/+15
| |\| | | | | | | | | | | | | | | | am: 83fde0ec25 Change-Id: Ic10c74e45f321c9f3435898bd0373a39ecd86acb
| | * Read both vendor.audio_hal.* and audio_hal.* syspropsJiyong Park2019-07-293-6/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Starting from Q-launching devices, all vendor-defined sysprops should be prefixed with "vendor.". To support such new devices as well as old devices where the renamining isn't required, audio HAL is using both properties: vendor.audio_hal.* is read first and then fall backs to audio_hal.*. Bug: b/138278883 Test: play some audio Test: run VtsTrebleSysProp Change-Id: I15158467f81ac99c36c40f6ca0a6c00cbca7fb24
* | Snap for 5681502 from aabff62fcb2f9d4f85f0353588b3632cd412615b to ↵android-build-team Robot2019-06-222-0/+26
|\| | | | | | | | | | | qt-qpr1-release Change-Id: Ieca4234b9d5dc065260e5662b8b9fe27aacc178e
| * Merge "audio_hw: close mmap file descriptor to fix leak" into qt-devEric Laurent2019-06-212-0/+26
| |\ | | | | | | | | | | | | | | | am: 2f07579d3b Change-Id: Ia42109dfd13bc6df0da72ce4cb6238b117ae5aaa
| | * Merge "audio_hw: close mmap file descriptor to fix leak" into qt-devEric Laurent2019-06-212-0/+26
| | |\
| | | * audio_hw: close mmap file descriptor to fix leakPhil Burk2019-06-202-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file descriptor for MMAP shared memory was created and passed to AudioFlinger but never closed. Now the FD is closed when the stream is goes to standby. Bug: 134381208 Test: Get HAL pid. Test: adb shell ps | grep audio Test: adb shell ls -l /proc/{halpid}/fd | wc Test: Run Oboetester or other app that uses MMAP Test: Completely close the app. Test: adb shell ls -l /proc/{halpid}/fd | wc Test: Count should NOT grow each time. Change-Id: Ieaaf1c6bdc96e7ecf01cee23215fb39f79662111
* | | | Snap for 5671249 from 5f004e7c184ebd7f39762a66c8991e6ba4333b23 to ↵android-build-team Robot2019-06-191-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I302e9b384aad040724261d6d39e927efcef8b144
| * | | audio: set hotword input for soundtrigger onlyCarter Hsu2019-06-181-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | am: 968d681ff5 Change-Id: I72e62768d78ed09203de4e3d631f8c1936f5386c
| | * | audio: set hotword input for soundtrigger onlyCarter Hsu2019-06-131-3/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sound_trigger session might have been paused while soundtrigger client starts to record. In this corner case, this input won't be detected as soundtrigger input in audio HAL since the st_session handle has been removed because the st_session is in pause state. Then soundtrigger input will try to open pcm driver and act as normal audio record, it will cause race condition on pcm node. To fix this, set the input with AUDIO_INPUT_FLAG_HW_HOTWORD flag to be always soundtrigger input. Bug: 135059114 Test: hotword/music detection works Change-Id: I4475bfb1d3e2c9b998c583e9244c0aa4f07b2134 Signed-off-by: Carter Hsu <carterhsu@google.com>
* | | Snap for 5645956 from 49210f533bc2b76d07290fba07b05f20058d379d to ↵android-build-team Robot2019-06-095-5/+37
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I7151f0dc7445e268c66465e9fb28b17a345acbde
| * | audio: Add support for DSDS for incall music featureVignesh Kulothungan2019-06-095-5/+37
| |\| | | | | | | | | | | | | | | | am: 3ff768954a Change-Id: Iea8f6b9347cd0527f721f06a4ee9a2d14f9819bb
| | * audio: Add support for DSDS for incall music featureVignesh Kulothungan2019-06-095-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for incall-music-uplink2 usecase to enable Dual Sim Dual Standby (DSDS) voice scenarios Bug: 132080107 Test: Local test Change-Id: I26206b1887f002bb58fcfb3378600ef81e111662 Signed-off-by: BubbleFang <bubblefang@google.com>
* | | Snap for 5626839 from 48c03fab1de9ffa2891cf7f67deaa3c6ea67e9ff to ↵android-build-team Robot2019-06-014-24/+198
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Id1b56e52b3bbd3d9520be9fe67870a4f8367b95f
| * | audio: fix AEC/NS effect controlCarter Hsu2019-05-304-21/+195
| |\| | | | | | | | | | | | | | | | am: b0c9148b00 Change-Id: If94c458d58e36a6933db66601abf5ae7520e19a2
| | * audio: fix AEC/NS effect controlCarter Hsu2019-05-294-21/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Q supports concurrent capture and will create more than one AEC/NS effects if app creates over 1 voice record tracks. Refine the AEC/NS control to support mutilple AEC/NS effects. Also correct the voice-call stream type in STHAL. Bug: 129111371 Bug: 128456220 Test: manual Change-Id: Icd0863f54e17cd6a5ee765f9bb5fe1b4580743a4 Signed-off-by: Carter Hsu <carterhsu@google.com>
| * | audio: fix control flowCarter Hsu2019-05-301-3/+3
| |\| | | | | | | | | | | | | | | | am: aaa9496b98 Change-Id: Ia89921ae7a5a2b09da3d507b3f58db1a86fe3b81
| | * audio: fix control flowCarter Hsu2019-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Audio HAL should notified STHAL before sending audio calibration of audio usecase to kernel. 2. Fix the condition logic of pcm_capture, the stream.out and stream.in are union, so we can't check if it's NULL. Bug: 129111371 Test: manual Change-Id: I39676410555f7f528c0705059c312a1250d489f0 Signed-off-by: Carter Hsu <carterhsu@google.com>
* | | Snap for 5582435 from 43b3772b83df40bb49e29abbd58cc07e51e55ca3 to ↵android-build-team Robot2019-05-181-4/+2
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I5e5d122e2ef05f1890ad8c2758d0a03ab6d99e00
| * | Merge "audio: fix resume music not smooth after press end call with touch ↵Robert Lee2019-05-151-4/+2
| |\| | | | | | | | | | | | | | | | | | | | | | sound" into qt-dev am: de49eecf02 Change-Id: I6813b53e094d15b4a1df954593d3a49470cf7030
| | * Merge "audio: fix resume music not smooth after press end call with touch ↵TreeHugger Robot2019-05-151-4/+2
| |/| | | | | | | | | | sound" into qt-dev
| | * audio: fix resume music not smooth after press end call with touch soundRobert Lee2019-04-191-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are three usecases, the first is low-latency-playback(touch sound), the second is audio-playback-voip(end call tone), the third is deep-buffer-playback or compress-offload-playback(Music). When low-latency-playback stop, it will trigger reroute to handset for audio-playback-voip first then reroute to speaker for deep-buffer-playback or compress-offload-playback. The fix is to trigger reroute only when audio-playback-voip stop. Bug: 130128135 Test: Music resume smoothly after press end call button w/ touch sound Change-Id: Id5e8cefd53a852d0ce98a9f5ce095bee5832cb5a Signed-off-by: Robert Lee <lerobert@google.com>
* | | Merge "hal: Modify A2DP output routing post releaseAudioPatch" into qt-devEric Laurent2019-05-092-1/+11
|\| | | | | | | | | | | | | | | | | am: bde007c7f0 Change-Id: I417add02df9cf2747a0d59791a2f3b695b443efd
| * | Merge "hal: Modify A2DP output routing post releaseAudioPatch" into qt-devEric Laurent2019-05-092-1/+11
| |\ \