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

This reverts commit f60491183d.
This commit is contained in:
Chris Elliott
2015-12-02 13:16:46 -08:00
parent 8780f07b5c
commit 8e79dae3f6

View File

@@ -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;