diff options
| author | John Spurlock <jspurlock@google.com> | 2014-02-13 09:39:14 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-02-13 09:39:14 -0500 |
| commit | 70cf4c104cc538678724ee61ae5538f76f2e0077 (patch) | |
| tree | ad7229c89ba66e59bb79a327b78c50d2306c3fbd /packages/SystemUI | |
| parent | cbdec7dd8c45f70c678029783ab2f5657f6b36bd (diff) | |
| download | frameworks_base-70cf4c104cc538678724ee61ae5538f76f2e0077.zip frameworks_base-70cf4c104cc538678724ee61ae5538f76f2e0077.tar.gz frameworks_base-70cf4c104cc538678724ee61ae5538f76f2e0077.tar.bz2 | |
Fix NPE in BaseStatusBar.
Bug:12996414
Change-Id: Icded809ce14ca6fc5d11bee1c2470152d507cee2
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 5 |
1 files 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 91ae973..649b51b 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); |