diff options
| author | Chris Wren <cwren@google.com> | 2014-05-08 21:03:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 21:03:04 +0000 |
| commit | 90abb78b51a35055f86dee35c4e391e74f325125 (patch) | |
| tree | 907f65d1a2f7cf9695228a98c433c5e9adfce46b /packages/SystemUI/src | |
| parent | 4463cbc61d0947eccb67a52f60661a92d0cad508 (diff) | |
| parent | 678f7edd140f3914655bc600d207d3dcb986f881 (diff) | |
| download | frameworks_base-90abb78b51a35055f86dee35c4e391e74f325125.zip frameworks_base-90abb78b51a35055f86dee35c4e391e74f325125.tar.gz frameworks_base-90abb78b51a35055f86dee35c4e391e74f325125.tar.bz2 | |
am 678f7edd: Merge "Avoid SystemUI crash due to NPE"
* commit '678f7edd140f3914655bc600d207d3dcb986f881':
Avoid SystemUI crash due to NPE
Diffstat (limited to 'packages/SystemUI/src')
| -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) { |