commit dfa5268d38143cfd6455838bebe1f03caa212c18
author JW Wang <wangchun@google.com> Wed Sep 11 15:16:49 2019 +0800
committer JW Wang <wangchun@google.com> Wed Sep 11 20:04:18 2019 +0800
tree b4824a84eb731c76996bce1aebcbd8907fe9d167
parent e226d5956b5ceed29dc86dbc611cd28f4b3b6327

Fix a typo in PackageWatchdog#updateConfigs

DEFAULT_TRIGGER_FAILURE_DURATION_MS should be assigned instead.

Bug: 140847332
Test: atest PackageWatchdogTest
Change-Id: I6956989ea8faf7de48ec83df38f15412e1aa624b

services/core/java/com/android/server/PackageWatchdog.java

diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index 20a9b20..548665b 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -80,10 +80,12 @@
             "watchdog_explicit_health_check_enabled";
 
     // Duration to count package failures before it resets to 0
-    private static final int DEFAULT_TRIGGER_FAILURE_DURATION_MS =
+    @VisibleForTesting
+    static final int DEFAULT_TRIGGER_FAILURE_DURATION_MS =
             (int) TimeUnit.MINUTES.toMillis(1);
     // Number of package failures within the duration above before we notify observers
-    private static final int DEFAULT_TRIGGER_FAILURE_COUNT = 5;
+    @VisibleForTesting
+    static final int DEFAULT_TRIGGER_FAILURE_COUNT = 5;
     // Whether explicit health checks are enabled or not
     private static final boolean DEFAULT_EXPLICIT_HEALTH_CHECK_ENABLED = true;
 
@@ -722,7 +724,7 @@
                     PROPERTY_WATCHDOG_TRIGGER_DURATION_MILLIS,
                     DEFAULT_TRIGGER_FAILURE_DURATION_MS);
             if (mTriggerFailureDurationMs <= 0) {
-                mTriggerFailureDurationMs = DEFAULT_TRIGGER_FAILURE_COUNT;
+                mTriggerFailureDurationMs = DEFAULT_TRIGGER_FAILURE_DURATION_MS;
             }
 
             setExplicitHealthCheckEnabled(DeviceConfig.getBoolean(