diff options
| author | Conley Owens <cco3@android.com> | 2011-05-03 16:19:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-03 16:19:42 -0700 |
| commit | ac671db7cb0ad49c8957acd4698e6139dfdb8b94 (patch) | |
| tree | 338cbe6166e6a93625b3b7437b341a3bdfc2c68c /src/com | |
| parent | 27a66070449c91de9177fe6a9ac48381608c517d (diff) | |
| parent | b67bae5b38b919cb113321ff0fc55b52c5a924fc (diff) | |
| download | SoundRecorder-ac671db7cb0ad49c8957acd4698e6139dfdb8b94.tar.gz | |
am b67bae5b: Merge "Playback in SoundRecorder interrupted by screen timeout."
* commit 'b67bae5b38b919cb113321ff0fc55b52c5a924fc':
Playback in SoundRecorder interrupted by screen timeout.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/soundrecorder/SoundRecorder.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/soundrecorder/SoundRecorder.java b/src/com/android/soundrecorder/SoundRecorder.java index 14a896d..2ae2c09 100644 --- a/src/com/android/soundrecorder/SoundRecorder.java +++ b/src/com/android/soundrecorder/SoundRecorder.java @@ -824,10 +824,7 @@ public class SoundRecorder extends Activity if (state == Recorder.PLAYING_STATE || state == Recorder.RECORDING_STATE) { mSampleInterrupted = false; mErrorUiMessage = null; - } - - if (state == Recorder.RECORDING_STATE) { - mWakeLock.acquire(); // we don't want to go to sleep while recording + mWakeLock.acquire(); // we don't want to go to sleep while recording or playing } else { if (mWakeLock.isHeld()) mWakeLock.release(); |