Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1198 from mfietz/issue/1110-wake-lock 

Do not acquire wakelock when Prestissimo backed mediaplayer is created
This commit is contained in:
Tom Hennen 2015-09-12 16:14:38 -04:00
parent 6d277e11e6 d546da80f8
commit e3513c783b
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/com/aocate/media/ServiceBackedMediaPlayer.java
View File

@ -20,8 +20,6 @@
package com.aocate.media; package com.aocate.media;
import java.io.IOException;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -30,8 +28,8 @@ import android.media.AudioManager;
import android.net.Uri; import android.net.Uri;
import android.os.IBinder; import android.os.IBinder;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException;
import android.os.PowerManager.WakeLock; import android.os.PowerManager.WakeLock;
import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import com.aocate.media.MediaPlayer.State; import com.aocate.media.MediaPlayer.State;
@ -46,6 +44,8 @@ import com.aocate.presto.service.IOnSeekCompleteListenerCallback_0_8;
import com.aocate.presto.service.IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8; import com.aocate.presto.service.IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8;
import com.aocate.presto.service.IPlayMedia_0_8; import com.aocate.presto.service.IPlayMedia_0_8;
import java.io.IOException;
import de.danoeh.antennapod.core.BuildConfig; import de.danoeh.antennapod.core.BuildConfig;
/** /**
@ -60,7 +60,7 @@ import de.danoeh.antennapod.core.BuildConfig;
public class ServiceBackedMediaPlayer extends MediaPlayerImpl { public class ServiceBackedMediaPlayer extends MediaPlayerImpl {
static final String INTENT_NAME = "com.aocate.intent.PLAY_AUDIO_ADJUST_SPEED_0_8"; static final String INTENT_NAME = "com.aocate.intent.PLAY_AUDIO_ADJUST_SPEED_0_8";
private static final String SBMP_TAG = "AocateServiceBackedMediaPlayer"; private static final String SBMP_TAG = "ServiceBackedMediaPlaye";
private ServiceConnection mPlayMediaServiceConnection = null; private ServiceConnection mPlayMediaServiceConnection = null;
protected IPlayMedia_0_8 pmInterface = null; protected IPlayMedia_0_8 pmInterface = null;
@ -874,19 +874,24 @@ public class ServiceBackedMediaPlayer extends MediaPlayerImpl {
// the client app's responsibility to request that permission // the client app's responsibility to request that permission
public void setWakeMode(Context context, int mode) { public void setWakeMode(Context context, int mode) {
Log.d(SBMP_TAG, "setWakeMode(context, " + mode + ")"); Log.d(SBMP_TAG, "setWakeMode(context, " + mode + ")");
if ((this.mWakeLock != null) boolean wasHeld = false;
&& (this.mWakeLock.isHeld())) { if (mWakeLock != null) {
this.mWakeLock.release(); if(mWakeLock.isHeld()) {
wasHeld = true;
Log.d(SBMP_TAG, "Releasing wakelock");
mWakeLock.release();
}
mWakeLock = null;
} }
if (mode != 0) { if (mode != 0) {
if (this.mWakeLock == null) {
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
// Since mode can't be changed on the fly, we have to allocate a new one mWakeLock = pm.newWakeLock(mode, this.getClass().getName());
this.mWakeLock = pm.newWakeLock(mode, this.getClass().getName()); mWakeLock.setReferenceCounted(false);
this.mWakeLock.setReferenceCounted(false);
}
this.mWakeLock.acquire(); if(wasHeld) {
Log.d(SBMP_TAG, "Acquiring wakelock");
mWakeLock.acquire();
}
} }
} }
@ -898,8 +903,10 @@ public class ServiceBackedMediaPlayer extends MediaPlayerImpl {
if (BuildConfig.DEBUG) Log.d(SBMP_TAG, "stayAwake(" + awake + ")"); if (BuildConfig.DEBUG) Log.d(SBMP_TAG, "stayAwake(" + awake + ")");
if (mWakeLock != null) { if (mWakeLock != null) {
if (awake && !mWakeLock.isHeld()) { if (awake && !mWakeLock.isHeld()) {
Log.d(SBMP_TAG, "Acquiring wakelock");
mWakeLock.acquire(); mWakeLock.acquire();
} else if (!awake && mWakeLock.isHeld()) { } else if (!awake && mWakeLock.isHeld()) {
Log.d(SBMP_TAG, "Releasing wakelock");
mWakeLock.release(); mWakeLock.release();
} }
} }