am 88bc1871: am 00a34ab5: Merge "Protect against null detail record." into mnc-dev

* commit '88bc1871f4c11682af249398713dbb7558759f22':
  Protect against null detail record.
This commit is contained in:
Jason Monk
2015-06-11 21:11:00 +00:00
committed by Android Git Automerger

View File

@@ -404,7 +404,9 @@ public class QSPanel extends ViewGroup {
((TileRecord) r).openingDetail = true; ((TileRecord) r).openingDetail = true;
} }
} else { } else {
MetricsLogger.hidden(mContext, mDetailRecord.detailAdapter.getMetricsCategory()); if (mDetailRecord != null) {
MetricsLogger.hidden(mContext, mDetailRecord.detailAdapter.getMetricsCategory());
}
mClosingDetail = true; mClosingDetail = true;
setGridContentVisibility(true); setGridContentVisibility(true);
listener = mTeardownDetailWhenDone; listener = mTeardownDetailWhenDone;