diff options
| author | Eric Laurent <elaurent@google.com> | 2011-07-24 10:12:36 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-07-25 18:53:32 -0700 |
| commit | 413248f2b1374bcf81c09b9fd9450541048f0b04 (patch) | |
| tree | c8a15f742263f40d760b5b6672619265a75a4f0c /libaudio | |
| parent | 40a09525b7c484764c64daa1ca663a314a1b6d31 (diff) | |
| download | device_samsung_crespo-413248f2b1374bcf81c09b9fd9450541048f0b04.zip device_samsung_crespo-413248f2b1374bcf81c09b9fd9450541048f0b04.tar.gz device_samsung_crespo-413248f2b1374bcf81c09b9fd9450541048f0b04.tar.bz2 | |
Fix issue 4604090: notification sound interrupted.
Removed wake lock acquisition from audio HAL. This is now done by
AudioFlinger via PowerManagerService.
Change-Id: I548a35eaf65fb27ea2cbed67cf89bef8f7eff830
Diffstat (limited to 'libaudio')
| -rw-r--r-- | libaudio/AudioHardware.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp index e65f454..3767496 100644 --- a/libaudio/AudioHardware.cpp +++ b/libaudio/AudioHardware.cpp @@ -33,7 +33,6 @@ #include "AudioHardware.h" #include <media/AudioRecord.h> -#include <hardware_legacy/power.h> #include <audio_effects/effect_aec.h> extern "C" { @@ -1134,8 +1133,6 @@ ssize_t AudioHardware::AudioStreamOutALSA::write(const void* buffer, size_t byte AutoMutex hwLock(mHardware->lock()); LOGD("AudioHardware pcm playback is exiting standby."); - acquire_wake_lock (PARTIAL_WAKE_LOCK, "AudioOutLock"); - sp<AudioStreamInALSA> spIn = mHardware->getActiveInput_l(); while (spIn != 0) { int cnt = spIn->prepareLock(); @@ -1167,7 +1164,6 @@ ssize_t AudioHardware::AudioStreamOutALSA::write(const void* buffer, size_t byte spIn->unlock(); } if (mPcm == NULL) { - release_wake_lock("AudioOutLock"); goto Error; } mStandby = false; @@ -1226,7 +1222,6 @@ void AudioHardware::AudioStreamOutALSA::doStandby_l() if (!mStandby) { LOGD("AudioHardware pcm playback is going to standby."); - release_wake_lock("AudioOutLock"); // stop echo reference capture if (mEchoReference != NULL) { mEchoReference->write(NULL); @@ -1768,8 +1763,6 @@ ssize_t AudioHardware::AudioStreamInALSA::read(void* buffer, ssize_t bytes) AutoMutex hwLock(mHardware->lock()); LOGD("AudioHardware pcm capture is exiting standby."); - acquire_wake_lock (PARTIAL_WAKE_LOCK, "AudioInLock"); - sp<AudioStreamOutALSA> spOut = mHardware->output(); while (spOut != 0) { spOut->prepareLock(); @@ -1809,7 +1802,6 @@ ssize_t AudioHardware::AudioStreamInALSA::read(void* buffer, ssize_t bytes) open_l(); if (mPcm == NULL) { - release_wake_lock("AudioInLock"); goto Error; } mStandby = false; @@ -1866,8 +1858,6 @@ void AudioHardware::AudioStreamInALSA::doStandby_l() if (!mStandby) { LOGD("AudioHardware pcm capture is going to standby."); - release_wake_lock("AudioInLock"); - if (mEchoReference != NULL) { // stop reading from echo reference mEchoReference->read(NULL); |