Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6ed5dcd authored by Chris Elliott's avatar Chris Elliott Committed by android-build-merger
Browse files

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

am: 087d30c1

* commit '087d30c1':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
parents 5ec51457 087d30c1

media/java/android/media/MediaPlayer.java

+0 −8
Original line number Diff line number Diff line
@@ -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;