diff options
| author | Chris Wren <cwren@google.com> | 2014-05-08 21:00:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-08 21:00:21 +0000 |
| commit | 678f7edd140f3914655bc600d207d3dcb986f881 (patch) | |
| tree | a721576bebba07c25c5b31fbf934969590b13a9d /packages | |
| parent | 3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3 (diff) | |
| parent | 5f3302622178ddd26848df39125a02405c764c41 (diff) | |
| download | frameworks_base-678f7edd140f3914655bc600d207d3dcb986f881.zip frameworks_base-678f7edd140f3914655bc600d207d3dcb986f881.tar.gz frameworks_base-678f7edd140f3914655bc600d207d3dcb986f881.tar.bz2 | |
Merge "Avoid SystemUI crash due to NPE"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index ed00398..604f4c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -841,6 +841,9 @@ public abstract class BaseStatusBar extends SystemUI implements } protected void addNotificationViews(NotificationData.Entry entry) { + if (entry == null) { + return; + } // Add the expanded view and icon. int pos = mNotificationData.add(entry); if (DEBUG) { |