From 7fd2a3bf6ae68a16084f3553d5b159b895e3103d Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 26 Mar 2014 12:39:41 -0400
Subject: always clear the HeadsUpDecayTimer

for non-clearable heads up notifications,
a decay timer may be left in the queue

Bug: 13652819
Change-Id: I533db43484731922790f8501250b5a1ca7d4ba0b
---
 .../src/com/android/systemui/statusbar/phone/PhoneStatusBar.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 91325ae07e99..b053dd784bbd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -981,9 +981,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
 
     @Override
     public void resetHeadsUpDecayTimer() {
+        mHandler.removeMessages(MSG_HIDE_HEADS_UP);
         if (mUseHeadsUp && mHeadsUpNotificationDecay > 0
                 && mHeadsUpNotificationView.isClearable()) {
-            mHandler.removeMessages(MSG_HIDE_HEADS_UP);
             mHandler.sendEmptyMessageDelayed(MSG_HIDE_HEADS_UP, mHeadsUpNotificationDecay);
         }
     }
-- 
cgit v1.2.3-59-g8ed1b