drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev

Browse Source 
am: 50276adde2

* commit '50276adde24c55394c0023ef49d01f054303dc87':
  MediaPlayer: Disable acquiring wakelocks based on property.
This commit is contained in:
Chris Elliott
2015-12-01 21:19:54 +00:00
committed by android-build-merger
parent 4ecf963e77 50276adde2
commit c54aa0c3f7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaPlayer.java
View File

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