diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-11 20:06:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 20:06:11 +0000 |
| commit | 00a34ab54c0e53461586c9596b4f43615319329f (patch) | |
| tree | e798b622fb35562cfd5ba6739d0c271f767ccb6d /packages | |
| parent | d0041e5f474f4e795d6bc9e5eeaec4098949897c (diff) | |
| parent | 78dcee592b146e4750f35e477dcda8e4d7565cde (diff) | |
| download | frameworks_base-00a34ab54c0e53461586c9596b4f43615319329f.zip frameworks_base-00a34ab54c0e53461586c9596b4f43615319329f.tar.gz frameworks_base-00a34ab54c0e53461586c9596b4f43615319329f.tar.bz2 | |
Merge "Protect against null detail record." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 49eb9b2..c8212c2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -404,7 +404,9 @@ public class QSPanel extends ViewGroup { ((TileRecord) r).openingDetail = true; } } else { - MetricsLogger.hidden(mContext, mDetailRecord.detailAdapter.getMetricsCategory()); + if (mDetailRecord != null) { + MetricsLogger.hidden(mContext, mDetailRecord.detailAdapter.getMetricsCategory()); + } mClosingDetail = true; setGridContentVisibility(true); listener = mTeardownDetailWhenDone; |