From 1a3f7db001a75770d888866a760e1308bb1f25fd Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Tue, 21 Oct 2014 15:16:16 -0400
Subject: VolumeDialog: Restore default-selection logic.

Bug: 18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
---
 packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/SystemUI/src/com/android/systemui/volume')

diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index d7552b6..69be377 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -430,7 +430,8 @@ public class ZenModePanel extends LinearLayout {
         }
         tag.condition = condition;
         tag.rb.setEnabled(enabled);
-        if (sameConditionId(mSessionExitCondition, tag.condition)) {
+        if (mSessionExitCondition != null
+                && sameConditionId(mSessionExitCondition, tag.condition)) {
             tag.rb.setChecked(true);
         }
         tag.rb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-- 
cgit v1.1