diff options
| author | Selim Cinek <cinek@google.com> | 2015-04-20 13:04:47 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2015-04-20 13:04:47 -0700 |
| commit | 2f6b3fb90f069fdb8502dedf657790bf3d94dbd0 (patch) | |
| tree | c6767268188c1b37af5e7049706eefa214004520 | |
| parent | 29fa89b41e15ee61a1ec13307596fe5f5f4c376c (diff) | |
| download | frameworks_base-2f6b3fb90f069fdb8502dedf657790bf3d94dbd0.zip frameworks_base-2f6b3fb90f069fdb8502dedf657790bf3d94dbd0.tar.gz frameworks_base-2f6b3fb90f069fdb8502dedf657790bf3d94dbd0.tar.bz2 | |
Fixed a crash with HUN notifications
Bug: 20421801
Change-Id: Ifc4445e585d924388f0642379c5268b6bbfb2e99
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL * @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; |