commit 2eec3d14249640988ad6f89c49e6ea155f3ec744
author Christopher Tate <ctate@google.com> Mon Apr 20 21:22:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 20 21:22:37 2015 +0000
tree fcb6e0ec4b0fb32ba0282383a9134b2cd8078ea1
parent 84b8b066b40b14854561d103e26fb1c7bca243cc
parent f9767d680d63ac1771a17ccc5775cd337ff967b8

Merge "Infrastructure for notification backup/restore"

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
index dccf2e2..b4e4773 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
@@ -314,7 +314,8 @@
      * @return whether the touch is valid and should not be discarded
      */
     public boolean shouldSwallowClick(String key) {
-        if (mClock.currentTimeMillis() < mHeadsUpEntries.get(key).postTime) {
+        HeadsUpEntry entry = mHeadsUpEntries.get(key);
+        if (entry != null && mClock.currentTimeMillis() < entry.postTime) {
             return true;
         }
         return false;