Merge "Fix test failures" into main (f60595d0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/notification/modes/ZenModesBackend.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ class ZenModesBackend {
		.setManualInvocationAllowed(true)
		.setConfigurationActivity(null) // No further settings
		.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)
		.setIconResId(com.android.internal.R.drawable.ic_zen_24dp)
		.build();

		return ZenMode.manualDndMode(manualDndRule,

+2 −6

Original line number	Diff line number	Diff line
		@@ -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));
		}