Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev

Browse Source 
* commit '06a86644cca0621696afc38db02f2fe2010f120c':
  Fix wakelock leak for dozing
This commit is contained in:
Adrian Roos
2015-08-19 21:01:28 +00:00
committed by Android Git Automerger
parent 86d86c2e7c 06a86644cc
commit 359f59445d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
View File

@@ -256,6 +256,8 @@ public class DozeService extends DreamService {
private void continuePulsing(int reason) { private void continuePulsing(int reason) {
if (mHost.isPulsingBlocked()) { if (mHost.isPulsingBlocked()) {
mPulsing = false;
mWakeLock.release();
return; return;
} }
mHost.pulseWhileDozing(new DozeHost.PulseCallback() { mHost.pulseWhileDozing(new DozeHost.PulseCallback() {

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
View File

@@ -104,13 +104,11 @@ public class DozeScrimController {
* Aborts pulsing immediately. * Aborts pulsing immediately.
*/ */
public void abortPulsing() { public void abortPulsing() {
mHandler.removeCallbacks(mPulseIn); cancelPulsing();
abortAnimations();
if (mDozing) { if (mDozing) {
mScrimController.setDozeBehindAlpha(1f); mScrimController.setDozeBehindAlpha(1f);
mScrimController.setDozeInFrontAlpha(1f); mScrimController.setDozeInFrontAlpha(1f);
} }
mPulseCallback = null;
} }
public void onScreenTurnedOn() { public void onScreenTurnedOn() {