From 78dcee592b146e4750f35e477dcda8e4d7565cde Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Thu, 11 Jun 2015 15:57:41 -0400
Subject: Protect against null detail record.

Bug: 21779477
Change-Id: I70abe5d88f7ca0db782182937f5b73a9e9be1f5a
---
 packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

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;
-- 
cgit v1.1