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

* commit 'e23ab08fe7ddeb9062392aa526faf487be7462f3': Fix pending dismiss action not cleared when leaving bouncer
2014-08-07 20:42:50 +00:00
parent 85f5303dcc 95202de09d
commit 6b43ad6853
1 changed files with 1 additions and 0 deletions
--- 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 class KeyguardBouncer {

    public void hide(boolean destroyView) {
        if (mKeyguardView != null) {
+            mKeyguardView.setOnDismissAction(null);
            mKeyguardView.cleanUp();
        }
        if (destroyView) {