diff --git a/modules/audio_device/android/test/src/org/webrtc/app/OpenSlDemo.java b/modules/audio_device/android/test/src/org/webrtc/app/OpenSlDemo.java
index 8060c99..9cd2bf9 100644
--- a/modules/audio_device/android/test/src/org/webrtc/app/OpenSlDemo.java
+++ b/modules/audio_device/android/test/src/org/webrtc/app/OpenSlDemo.java
@@ -15,8 +15,6 @@
 import android.content.pm.ActivityInfo;
 import android.media.AudioManager;
 import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -27,8 +25,6 @@
   private Button btStartStopCall;
   private boolean isRunning = false;
 
-  private WakeLock wakeLock;
-
   private OpenSlRunner runner;
 
   // Called when activity is created.
@@ -36,12 +32,6 @@
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
-    PowerManager pm = (PowerManager)this.getSystemService(
-        Context.POWER_SERVICE);
-    wakeLock = pm.newWakeLock(
-        PowerManager.SCREEN_DIM_WAKE_LOCK, TAG);
-    wakeLock.acquire(); // Keep screen on until app terminates.
-
     setContentView(R.layout.open_sl_demo);
 
     // Direct hardware volume controls to affect the voice call audio stream.
@@ -61,7 +51,6 @@
   @Override
   public void onDestroy() {
     Log.d(TAG, "onDestroy");
-    wakeLock.release();
     super.onDestroy();
   }
 
