diff options
| author | John Spurlock <jspurlock@google.com> | 2014-10-21 15:16:16 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-10-21 15:16:16 -0400 |
| commit | 1a3f7db001a75770d888866a760e1308bb1f25fd (patch) | |
| tree | 3490c58960e2e905e8dac7221f8dcdb45eba78e3 /packages/SystemUI/src/com/android/systemui/volume | |
| parent | cc8b3e8d4e561026cf673c9a234cc151f17b3362 (diff) | |
| download | frameworks_base-1a3f7db001a75770d888866a760e1308bb1f25fd.zip frameworks_base-1a3f7db001a75770d888866a760e1308bb1f25fd.tar.gz frameworks_base-1a3f7db001a75770d888866a760e1308bb1f25fd.tar.bz2 | |
VolumeDialog: Restore default-selection logic.
Bug: 18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java | 3 |
1 files changed, 2 insertions, 1 deletions
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() { |