Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Ignore setWakeMode based on system property.
Wakelocks essential for playback will be held by audioflinger.

Change-Id: I413cd873bf21e1e999dbf89a27802fbe1b6022c7
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
This commit is contained in:
Sridhar Vashist
2015-07-27 13:30:21 -05:00
committed by Chris Elliott
parent 0b388d4a36
commit efc0335586
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

@@ -37,6 +37,7 @@ import android.os.Process;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.OsConstants; import android.system.OsConstants;
@@ -1234,6 +1235,13 @@ public class MediaPlayer implements SubtitleController.Listener
*/ */
public void setWakeMode(Context context, int mode) { public void setWakeMode(Context context, int mode) {
boolean washeld = false; 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 != null) {
if (mWakeLock.isHeld()) { if (mWakeLock.isHeld()) {
washeld = true; washeld = true;