commit e881fd374be8474a3b0dd9311d3c468f5ea48ed2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 21:08:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 21:08:08 2020 +0000
tree 53f63c8108adb7644eef4b8d756c4c7d385e7c66
parent d1c4d27c839fdcec0db568ed58ebc6850ce08936
parent 3ae12a7bf4b11d3e0e644256abc644a407079db4

Disable Package Watchdog explicit health check during test am: 3ae12a7bf4

Change-Id: Ia63b88c43dd52a6fe4c7ebe80ce56852daec8484

tests/src/android/ext/services/watchdog/ExplicitHealthCheckServiceImplTest.java

diff --git a/tests/src/android/ext/services/watchdog/ExplicitHealthCheckServiceImplTest.java b/tests/src/android/ext/services/watchdog/ExplicitHealthCheckServiceImplTest.java
index beb86b9..c1b6549 100644
--- a/tests/src/android/ext/services/watchdog/ExplicitHealthCheckServiceImplTest.java
+++ b/tests/src/android/ext/services/watchdog/ExplicitHealthCheckServiceImplTest.java
@@ -55,6 +55,8 @@
 public class ExplicitHealthCheckServiceImplTest {
     private static final String NETWORK_STACK_CONNECTOR_CLASS =
             "android.net.INetworkStackConnector";
+    private static final String PROPERTY_WATCHDOG_EXPLICIT_HEALTH_CHECK_ENABLED =
+            "watchdog_explicit_health_check_enabled";
 
     private final Context mContext = InstrumentationRegistry.getContext();
     private IExplicitHealthCheckService mService;
@@ -81,10 +83,16 @@
                 ExplicitHealthCheckServiceImpl.PROPERTY_WATCHDOG_REQUEST_TIMEOUT_MILLIS,
                 Long.toString(ExplicitHealthCheckServiceImpl.DEFAULT_REQUEST_TIMEOUT_MILLIS),
                 false);
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,
+                PROPERTY_WATCHDOG_EXPLICIT_HEALTH_CHECK_ENABLED,
+                Boolean.toString(false), /* makeDefault */ false);
     }
 
     @After
     public void tearDown() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,
+                PROPERTY_WATCHDOG_EXPLICIT_HEALTH_CHECK_ENABLED,
+                Boolean.toString(true), /* makeDefault */ false);
         InstrumentationRegistry
                 .getInstrumentation()
                 .getUiAutomation()