Zen: Be more defensive against old time conditions.
Bug:16192570
Change-Id: If5097174fac89c5d809271241645d1efca92476e
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 @@
}
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
}