diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-07-29 12:50:06 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2011-07-29 12:50:06 -0400 |
| commit | 2fb30a92d59c2a0912e00f2191522a3de5027b84 (patch) | |
| tree | 9142a77c49f37a1f10b1ee306b1033990befe31f | |
| parent | f3f2011285e2f5079db2229461e2d9a448cb61ec (diff) | |
| download | frameworks_base-2fb30a92d59c2a0912e00f2191522a3de5027b84.zip frameworks_base-2fb30a92d59c2a0912e00f2191522a3de5027b84.tar.gz frameworks_base-2fb30a92d59c2a0912e00f2191522a3de5027b84.tar.bz2 | |
Quick fix for NPE in updateNotification().
When the "ongoing"/"latest" split is removed, this will be
replaced with something less odious.
Bug: 5090331
Change-Id: Ib804de66985ff5f5df2e1df3c85437a1e31f1c49
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 8ff1dbf..f8ceb8f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -664,8 +664,10 @@ public class PhoneStatusBar extends StatusBar { if (notification.notification.largeIcon != null) { oldEntry.largeIcon.setImageBitmap(notification.notification.largeIcon); } else { - oldEntry.largeIcon.getLayoutParams().width = 0; - oldEntry.largeIcon.setVisibility(View.INVISIBLE); + if (oldEntry.largeIcon != null) { + oldEntry.largeIcon.getLayoutParams().width = 0; + oldEntry.largeIcon.setVisibility(View.INVISIBLE); + } } } |