norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Only hold one wake lock

Browse Source
This commit is contained in:
Christopher Eby 2011-09-18 09:27:23 -05:00
parent 9471e2a0bc
commit 7621c9312e
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/kreed/vanilla/PlaybackService.java
View File

@ -173,7 +173,6 @@ public final class PlaybackService extends Service implements Handler.Callback,
mMediaPlayer = new MediaPlayer(); mMediaPlayer = new MediaPlayer();
mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
mMediaPlayer.setWakeMode(this, PowerManager.PARTIAL_WAKE_LOCK);
mMediaPlayer.setOnCompletionListener(this); mMediaPlayer.setOnCompletionListener(this);
mMediaPlayer.setOnErrorListener(this); mMediaPlayer.setOnErrorListener(this);
@ -192,7 +191,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
Song.mDisableCoverArt = settings.getBoolean("disable_cover_art", false); Song.mDisableCoverArt = settings.getBoolean("disable_cover_art", false);
PowerManager powerManager = (PowerManager)getSystemService(POWER_SERVICE); PowerManager powerManager = (PowerManager)getSystemService(POWER_SERVICE);
mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VanillaMusicSongChangeLock"); mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VanillaMusicLock");
mLooper = thread.getLooper(); mLooper = thread.getLooper();
mHandler = new Handler(mLooper, this); mHandler = new Handler(mLooper, this);
@ -430,6 +429,9 @@ public final class PlaybackService extends Service implements Handler.Callback,
} }
if (mNotificationMode != NEVER) if (mNotificationMode != NEVER)
startForegroundCompat(NOTIFICATION_ID, new SongNotification(mCurrentSong, true)); startForegroundCompat(NOTIFICATION_ID, new SongNotification(mCurrentSong, true));
if (mWakeLock != null)
mWakeLock.acquire();
} else { } else {
if (mMediaPlayerInitialized) { if (mMediaPlayerInitialized) {
synchronized (mMediaPlayer) { synchronized (mMediaPlayer) {
@ -442,6 +444,9 @@ public final class PlaybackService extends Service implements Handler.Callback,
} else { } else {
stopForegroundCompat(true); stopForegroundCompat(true);
} }
if (mWakeLock != null && mWakeLock.isHeld())
mWakeLock.release();
} }
} }
@ -580,10 +585,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
public void onCompletion(MediaPlayer player) public void onCompletion(MediaPlayer player)
{ {
if (mWakeLock != null) setCurrentSong(+1);
mWakeLock.acquire();
mHandler.sendEmptyMessage(TRACK_CHANGED);
mHandler.sendEmptyMessage(RELEASE_WAKE_LOCK);
} }
public boolean onError(MediaPlayer player, int what, int extra) public boolean onError(MediaPlayer player, int what, int extra)
@ -698,8 +700,6 @@ public final class PlaybackService extends Service implements Handler.Callback,
* will be stopped. * will be stopped.
*/ */
private static final int IDLE_TIMEOUT = 4; private static final int IDLE_TIMEOUT = 4;
private static final int TRACK_CHANGED = 5;
private static final int RELEASE_WAKE_LOCK = 6;
/** /**
* Decrease the volume gradually over five seconds, pausing when 0 is * Decrease the volume gradually over five seconds, pausing when 0 is
* reached. * reached.
@ -729,14 +729,6 @@ public final class PlaybackService extends Service implements Handler.Callback,
public boolean handleMessage(Message message) public boolean handleMessage(Message message)
{ {
switch (message.what) { switch (message.what) {
case TRACK_CHANGED:
setCurrentSong(+1);
setFlag(FLAG_PLAYING);
break;
case RELEASE_WAKE_LOCK:
if (mWakeLock != null && mWakeLock.isHeld())
mWakeLock.release();
break;
case CALL_GO: case CALL_GO:
int delta = (Integer)message.obj; int delta = (Integer)message.obj;
go(delta, false); go(delta, false);