diff options
| author | John Spurlock <jspurlock@google.com> | 2014-02-13 06:54:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-13 06:54:02 -0800 |
| commit | a5bf29873ed96a5f68d06a985c00796be1b3744c (patch) | |
| tree | 9c08cbacf4cae87a15b98d926be3e1649b826213 | |
| parent | 40f12d98248a8b4a6a34fc43538e349bda4289ef (diff) | |
| parent | f6475c7204759a57bc730e2bbaefb3448a77c141 (diff) | |
| download | frameworks_base-a5bf29873ed96a5f68d06a985c00796be1b3744c.zip frameworks_base-a5bf29873ed96a5f68d06a985c00796be1b3744c.tar.gz frameworks_base-a5bf29873ed96a5f68d06a985c00796be1b3744c.tar.bz2 | |
am f6475c72: Merge "Fix NPE in BaseStatusBar."
* commit 'f6475c7204759a57bc730e2bbaefb3448a77c141':
Fix NPE in BaseStatusBar.
| -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); |