am ac671db7: am b67bae5b: Merge "Playback in SoundRecorder interrupted by screen timeout."

* commit 'ac671db7':
  Playback in SoundRecorder interrupted by screen timeout.

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();