Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1a3f7db001a75770d888866a760e1308bb1f25fd':
  VolumeDialog: Restore default-selection logic.
This commit is contained in:
John Spurlock
2014-10-21 19:47:00 +00:00
committed by Android Git Automerger
parent c6639c26ed 1a3f7db001
commit 0dfda02ec3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
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() {