Merge "Temporarily reenable 3P condition providers."

This commit is contained in:
Julia Reynolds
2015-10-28 14:34:41 +00:00
committed by Android (Google) Code Review

View File

@@ -241,6 +241,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
final ComponentName configurationActivity = getSettingsActivity(si); final ComponentName configurationActivity = getSettingsActivity(si);
if (ruleType != null && !ruleType.trim().isEmpty() && configurationActivity != null) { if (ruleType != null && !ruleType.trim().isEmpty() && configurationActivity != null) {
final ZenRuleInfo ri = new ZenRuleInfo(); final ZenRuleInfo ri = new ZenRuleInfo();
ri.serviceComponent = new ComponentName(si.packageName, si.name);
ri.settingsAction = Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS; ri.settingsAction = Settings.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS;
ri.title = ruleType; ri.title = ruleType;
ri.packageName = si.packageName; ri.packageName = si.packageName;