commit 8e79dae3f67aae032010ddbbef2f8032ace01263
author Chris Elliott <chriselliott@google.com> Wed Dec 02 13:16:46 2015 -0800
committer Chris Elliott <chriselliott@google.com> Wed Dec 02 13:16:46 2015 -0800
tree 28486a57dec7a8ec7b2743f762ee27aaee219ef1
parent 8780f07b5c2a318cb28c172f9eac47b975793c90

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

This reverts commit f60491183def4c46b4026afb4648544e7289ea5f.

media/java/android/media/MediaPlayer.java

diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index d1a1077..587d494 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -36,7 +36,6 @@
 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 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;