diff options
| author | John Spurlock <jspurlock@google.com> | 2014-10-21 19:47:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 19:47:00 +0000 |
| commit | 0dfda02ec30ee155fd26af0a5d390c504807e0eb (patch) | |
| tree | 441b9ac5c08fbadbcd879d962c0a35b442351925 | |
| parent | c6639c26ed6fddafd73210e535b0bb359a8192c0 (diff) | |
| parent | 1a3f7db001a75770d888866a760e1308bb1f25fd (diff) | |
| download | frameworks_base-0dfda02ec30ee155fd26af0a5d390c504807e0eb.zip frameworks_base-0dfda02ec30ee155fd26af0a5d390c504807e0eb.tar.gz frameworks_base-0dfda02ec30ee155fd26af0a5d390c504807e0eb.tar.bz2 | |
am 1a3f7db0: VolumeDialog: Restore default-selection logic.
* commit '1a3f7db001a75770d888866a760e1308bb1f25fd':
VolumeDialog: Restore default-selection logic.
| -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() { |