am 92b32c41: am afbfb9b5: Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev

* commit '92b32c411a9d0acb5abd192ae959b5ed47b88f0a':
  Doze: Fix NPE found when pulsing and !dozing.
This commit is contained in:
John Spurlock
2014-09-22 19:58:44 +00:00
committed by Android Git Automerger

View File

@@ -148,7 +148,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener {
if (!mDozing || mPulseCallback != null) {
// Pulse suppressed.
mPulseCallback.onPulseFinished();
callback.onPulseFinished();
return;
}