DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6

am: 087d30c142

* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."

1 files changed, 0 insertions, 8 deletions

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index f5b7a2e44d71..1c2c9406621d 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -36,7 +36,6 @@ import android.os.Process;
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.SystemProperties;
 import android.provider.Settings;
 import android.system.ErrnoException;
 import android.system.OsConstants;
@@ -1261,13 +1260,6 @@ public class MediaPlayer implements SubtitleController.Listener
      */
     public void setWakeMode(Context context, int mode) {
         boolean washeld = false;
-
-        /* Disable persistant wakelocks in media player based on property */
-        if (SystemProperties.getBoolean("audio.offload.ignore_setawake", false) == true) {
-            Log.w(TAG, "IGNORING setWakeMode " + mode);
-            return;
-        }
-
         if (mWakeLock != null) {
             if (mWakeLock.isHeld()) {
                 washeld = true;