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

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

Merge "MediaPlayer: Disable acquiring wakelocks based on property." into... 

Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276add am: c54aa0c3 am: 767e2b39
am: 1709832d

* commit '1709832d':
  MediaPlayer: Disable acquiring wakelocks based on property.
parents 84a860f2 1709832d

media/java/android/media/MediaPlayer.java

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 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;
@@ -1260,6 +1261,13 @@ 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;