Merge "Quick fix for NPE in updateNotification()."

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 8ff1dbf8e66d..f8ceb8f21ff7 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);
+                    }
                 }
 
             }