From bc5858f4893558ae6fee24c14489be56e6c3f528 Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Fri, 11 Jul 2014 14:33:18 -0400
Subject: Zen: Be more defensive against old time conditions.

Bug:16192570
Change-Id: If5097174fac89c5d809271241645d1efca92476e
---
 packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index 6bb9765..9c166ac 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -215,10 +215,12 @@ public class ZenModePanel extends LinearLayout {
     }
 
     private void refreshExitConditionText() {
+        final String forever = mContext.getString(R.string.zen_mode_forever);
         if (mExitConditionId == null) {
-            mExitConditionText = mContext.getString(R.string.zen_mode_forever);
+            mExitConditionText = forever;
         } else if (ZenModeConfig.isValidCountdownConditionId(mExitConditionId)) {
-            mExitConditionText = parseExistingTimeCondition(mExitConditionId).summary;
+            final Condition condition = parseExistingTimeCondition(mExitConditionId);
+            mExitConditionText = condition != null ? condition.summary : forever;
         } else {
             mExitConditionText = "(until condition ends)";  // TODO persist current description
         }
-- 
cgit v1.1