From 0e60e51128519f1d44ceaa204b592b62595f81e2 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Fri, 8 Mar 2013 14:28:24 +0100 Subject: [PATCH] only acquire a new wakelock if we are not already holding one This fixes a bug where VanillaMusic would hold multiple references to the same wakelock, resulting in a battery drain (as the lock refcount would never reach zero). --- src/ch/blinkenlights/android/vanilla/PlaybackService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java index f3f855c0..f03e10e3 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java @@ -783,7 +783,7 @@ public final class PlaybackService extends Service mHandler.removeMessages(RELEASE_WAKE_LOCK); try { - if (mWakeLock != null) + if (mWakeLock != null && mWakeLock.isHeld() == false) mWakeLock.acquire(); } catch (SecurityException e) { // Don't have WAKE_LOCK permission