From 70cf4c104cc538678724ee61ae5538f76f2e0077 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Thu, 13 Feb 2014 09:39:14 -0500 Subject: [PATCH] Fix NPE in BaseStatusBar. Bug:12996414 Change-Id: Icded809ce14ca6fc5d11bee1c2470152d507cee2 --- .../src/com/android/systemui/statusbar/BaseStatusBar.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 91ae97322cc2b..649b51bf5e02b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1136,8 +1136,9 @@ public abstract class BaseStatusBar extends SystemUI implements StatusBarNotification notification, boolean isHeadsUp) { final RemoteViews contentView = notification.getNotification().contentView; final RemoteViews bigContentView = notification.getNotification().bigContentView; - final RemoteViews publicContentView - = notification.getNotification().publicVersion.contentView; + final Notification publicVersion = notification.getNotification().publicVersion; + final RemoteViews publicContentView = publicVersion != null ? publicVersion.contentView + : null; // Reapply the RemoteViews contentView.reapply(mContext, entry.expanded, mOnClickHandler);