summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2010-10-15 14:01:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 14:01:15 -0700
commiteff1d942ad214b5ca9c14ec242f6d767372648a1 (patch)
tree2ada8597eda72f7622b110be5cab7de078f0c468
parent05a8a80a3c294261dab8ee98b2b0792783f36aa8 (diff)
parentb508a4857b07898fb8322a858c4ee9624bcf1180 (diff)
downloadmsm7k-eff1d942ad214b5ca9c14ec242f6d767372648a1.tar.gz
am b508a485: libaudio-qsd8k: acquire wakelock before starting playback
Merge commit 'b508a4857b07898fb8322a858c4ee9624bcf1180' * commit 'b508a4857b07898fb8322a858c4ee9624bcf1180': libaudio-qsd8k: acquire wakelock before starting playback
-rw-r--r--libaudio-qsd8k/AudioHardware.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libaudio-qsd8k/AudioHardware.cpp b/libaudio-qsd8k/AudioHardware.cpp
index e5108e7..db39d9e 100644
--- a/libaudio-qsd8k/AudioHardware.cpp
+++ b/libaudio-qsd8k/AudioHardware.cpp
@@ -1587,6 +1587,9 @@ ssize_t AudioHardware::AudioStreamOutMSM72xx::write(const void* buffer, size_t b
if (mStandby) {
+ LOGV("acquire output wakelock");
+ acquire_wake_lock(PARTIAL_WAKE_LOCK, kOutputWakelockStr);
+
// open driver
LOGV("open pcm_out driver");
status = ::open("/dev/msm_pcm_out", O_RDWR);
@@ -1637,8 +1640,6 @@ ssize_t AudioHardware::AudioStreamOutMSM72xx::write(const void* buffer, size_t b
goto Error;
}
- LOGV("acquire output wakelock");
- acquire_wake_lock(PARTIAL_WAKE_LOCK, kOutputWakelockStr);
mStandby = false;
}
@@ -1663,7 +1664,7 @@ Error:
}
// Simulate audio output timing in case of error
usleep(bytes * 1000000 / frameSize() / sampleRate());
-
+ release_wake_lock(kOutputWakelockStr);
return status;
}