From 8e79dae3f67aae032010ddbbef2f8032ace01263 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 2 Dec 2015 13:16:46 -0800 Subject: DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." This reverts commit f60491183def4c46b4026afb4648544e7289ea5f. --- media/java/android/media/MediaPlayer.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'media') 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.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; -- cgit v1.1