commit 66cb05e90d5ac8b7c72acd51db8cfd02d2513c58
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jul 11 18:23:50 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 11 18:23:50 2024 +0000
tree a43d4a931b31b12d83f682e19271d2ef7aa7da51
parent e5bad4c4816bba7c7b461cc1c4ba15be5acd41c1
parent 61f15e59407a9dc15550955d6803750db000fb3b

Merge "Mock System Settings for NotificationAttentionHelperTest" into main

services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java

diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java
index 28a5db9..e06d939 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAttentionHelperTest.java
@@ -223,6 +223,10 @@
         Settings.System.putInt(getContext().getContentResolver(),
                 Settings.System.NOTIFICATION_LIGHT_PULSE, 1);
 
+        // Enable notification cooldown independent of device Settings
+        Settings.System.putInt(getContext().getContentResolver(),
+                Settings.System.NOTIFICATION_COOLDOWN_ENABLED, 1);
+
         Resources resources = spy(getContext().getResources());
         when(resources.getBoolean(R.bool.config_useAttentionLight)).thenReturn(true);
         when(resources.getBoolean(