summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-09-23 16:39:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-23 16:39:40 +0000
commit510e8cdc8d5e818050f851191902b066734c51a7 (patch)
treee6c4e069442da921d649efb06a732deaf71d3ca5
parentcbd333b256a9f301de549dbe9aa7614103835d97 (diff)
parenta273924b8c47c9b1d5f74ae82a594451514ba5dd (diff)
downloadframeworks_base-510e8cdc8d5e818050f851191902b066734c51a7.zip
frameworks_base-510e8cdc8d5e818050f851191902b066734c51a7.tar.gz
frameworks_base-510e8cdc8d5e818050f851191902b066734c51a7.tar.bz2
Merge "Ensure wakelock is released unconditionally." into lmp-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/doze/DozeService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index b07e993..6cc890b 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -199,8 +199,8 @@ public class DozeService extends DreamService {
if (mPulsing && mDreaming) {
mPulsing = false;
turnDisplayOff();
- mWakeLock.release();
}
+ mWakeLock.release(); // needs to be unconditional to balance acquire
}
});
}