Merge "Fix test failures" into main

This commit is contained in:
Julia Reynolds
2024-05-20 18:24:42 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 7 deletions

View File

@@ -142,13 +142,11 @@ public class ZenModesBackendTest {
.setType(AutomaticZenRule.TYPE_OTHER)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy))
.setTriggerDescription(
mContext.getString(R.string.zen_mode_settings_summary))
.setManualInvocationAllowed(true)
.build(),
false),
new ZenMode("rule1", ZEN_RULE, false),
new ZenMode("rule2", rule2, false))
new ZenMode("rule2", rule2, false),
new ZenMode("rule1", ZEN_RULE, false))
.inOrder();
}
@@ -167,8 +165,6 @@ public class ZenModesBackendTest {
.setType(AutomaticZenRule.TYPE_OTHER)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy))
.setTriggerDescription(
mContext.getString(R.string.zen_mode_settings_summary))
.setManualInvocationAllowed(true)
.build(), false));
}