commit 95202de09de7abf9e847e9d7f38388b492336154
author Adrian Roos <roosa@google.com> Thu Aug 07 20:38:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 07 18:49:59 2014 +0000
tree b82db041d8178fec649698b52845259515adcfc6
parent 11e84ce024e763d16108e49e96f65657b70c7585
parent 559b41f42455377c70ac5a1a10516cd34e9324ae

Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index 8996197..3b14082 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -82,6 +82,7 @@
 
     public void hide(boolean destroyView) {
         if (mKeyguardView != null) {
+            mKeyguardView.setOnDismissAction(null);
             mKeyguardView.cleanUp();
         }
         if (destroyView) {