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 am: 50276adde2 am: c54aa0c3f7

Browse Source 
am: 767e2b39db

* commit '767e2b39db78e41241998b7b3941a15d68c6b4f2':
  MediaPlayer: Disable acquiring wakelocks based on property.
This commit is contained in:
Chris Elliott
2015-12-01 23:37:28 +00:00
committed by android-build-merger
parent bb670fc3ea 767e2b39db
commit 1709832d47
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;