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

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

Browse Source 
am: 8e79dae3f6

* commit '8e79dae3f67aae032010ddbbef2f8032ace01263':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
This commit is contained in:
Chris Elliott
2015-12-02 21:57:06 +00:00
committed by android-build-merger
parent 0ede75507c 8e79dae3f6
commit 087d30c142
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,6 @@ 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;
@ -1261,13 +1260,6 @@ 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;