am 0dfda02e: am 1a3f7db0: VolumeDialog: Restore default-selection logic.

* commit '0dfda02ec30ee155fd26af0a5d390c504807e0eb':
  VolumeDialog: Restore default-selection logic.
This commit is contained in:
John Spurlock
2014-10-21 21:25:34 +00:00
committed by Android Git Automerger

View File

@@ -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() {