Merge "Limit watchdog check to device related failures"

1 files changed, 13 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/BssidBlocklistMonitorTest.java b/tests/wifitests/src/com/android/server/wifi/BssidBlocklistMonitorTest.java
index 3d397a241..7f72269bd 100644
--- a/tests/wifitests/src/com/android/server/wifi/BssidBlocklistMonitorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/BssidBlocklistMonitorTest.java
@@ -396,7 +396,8 @@ public class BssidBlocklistMonitorTest {
 
     /**
      * Verify that a BSSID is not added to blocklist as long as
-     * mWifiLastResortWatchdog.shouldIgnoreBssidUpdate is returning true.
+     * mWifiLastResortWatchdog.shouldIgnoreBssidUpdate is returning true, for failure reasons
+     * that are also being tracked by the watchdog.
      */
     @Test
     public void testWatchdogIsGivenChanceToTrigger() {
@@ -414,6 +415,17 @@ public class BssidBlocklistMonitorTest {
     }
 
     /**
+     * Verify that non device related errors, and errors that are not monitored by the watchdog
+     * bypasses the watchdog check.
+     */
+    @Test
+    public void testUnrelatedErrorsBypassWatchdogCheck() {
+        when(mWifiLastResortWatchdog.shouldIgnoreBssidUpdate(anyString())).thenReturn(true);
+        verifyAddTestBssidToBlocklist();
+        verify(mWifiLastResortWatchdog, never()).shouldIgnoreBssidUpdate(anyString());
+    }
+
+    /**
      * Verify that we are correctly filtering by SSID when sending a blocklist down to firmware.
      */
     @Test