summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-06-11 15:57:41 -0400
committerJason Monk <jmonk@google.com>2015-06-11 15:57:41 -0400
commit78dcee592b146e4750f35e477dcda8e4d7565cde (patch)
tree4e1ec1f74fa2952746059db2a77831e4246ee96f /packages
parentfd9a2dafdc6516a62bdf13c81ec2ac579a8fd998 (diff)
downloadframeworks_base-78dcee592b146e4750f35e477dcda8e4d7565cde.zip
frameworks_base-78dcee592b146e4750f35e477dcda8e4d7565cde.tar.gz
frameworks_base-78dcee592b146e4750f35e477dcda8e4d7565cde.tar.bz2
Protect against null detail record.
Bug: 21779477 Change-Id: I70abe5d88f7ca0db782182937f5b73a9e9be1f5a
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSPanel.java4
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;