diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-07 22:26:43 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-07 22:26:43 -0800 |
| commit | 26c67740c7b6a2c6e03a0ec4249fa5b5ede25322 (patch) | |
| tree | e31da5910d0c88c0fb9cd6fb310ae157dd2c7619 | |
| parent | 976093ef6ead2b0230665405426f373a2fcfeb40 (diff) | |
| parent | 920dc03173b646b0702570479d494975d1e4dff1 (diff) | |
| download | android_hardware_qcom_audio-26c67740c7b6a2c6e03a0ec4249fa5b5ede25322.tar.gz android_hardware_qcom_audio-26c67740c7b6a2c6e03a0ec4249fa5b5ede25322.tar.bz2 android_hardware_qcom_audio-26c67740c7b6a2c6e03a0ec4249fa5b5ede25322.zip | |
Merge "hal: spkr_prot: release adev lock during sleep" into av-userspace.lnx.1.0-dev.1.0
| -rw-r--r-- | hal/audio_extn/spkr_protection.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c index 53cca7de..5d35969f 100644 --- a/hal/audio_extn/spkr_protection.c +++ b/hal/audio_extn/spkr_protection.c @@ -775,7 +775,11 @@ static void* spkr_calibration_thread() break; } t0_spk_prior = t0_spk_1; + pthread_mutex_unlock(&adev->lock); sleep(1); + pthread_mutex_lock(&adev->lock); + if (is_speaker_in_use(&sec)) + break; } else { ALOGE("%s: read fail for %s err:%d\n", __func__, wsa_path, ret); break; @@ -817,7 +821,11 @@ static void* spkr_calibration_thread() break; } t0_spk_prior = t0_spk_2; + pthread_mutex_unlock(&adev->lock); sleep(1); + pthread_mutex_lock(&adev->lock); + if (is_speaker_in_use(&sec)) + break; } else { ALOGE("%s: read fail for %s err:%d\n", __func__, wsa_path, ret); break; |