Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in BaseStatusBar."

Browse Source
This commit is contained in:
John Spurlock
2014-02-13 14:47:52 +00:00
committed by Android (Google) Code Review
parent 0051514845 70cf4c104c
commit f6475c7204
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -1136,8 +1136,9 @@ public abstract class BaseStatusBar extends SystemUI implements
StatusBarNotification notification, boolean isHeadsUp) { StatusBarNotification notification, boolean isHeadsUp) {
final RemoteViews contentView = notification.getNotification().contentView; final RemoteViews contentView = notification.getNotification().contentView;
final RemoteViews bigContentView = notification.getNotification().bigContentView; final RemoteViews bigContentView = notification.getNotification().bigContentView;
final RemoteViews publicContentView final Notification publicVersion = notification.getNotification().publicVersion;
= notification.getNotification().publicVersion.contentView; final RemoteViews publicContentView = publicVersion != null ? publicVersion.contentView
: null;
// Reapply the RemoteViews // Reapply the RemoteViews
contentView.reapply(mContext, entry.expanded, mOnClickHandler); contentView.reapply(mContext, entry.expanded, mOnClickHandler);