summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2019-06-03 20:57:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-06-03 20:57:21 +0000
commitc1fb7dd2189d97bae31ad916d06df94feeef54ae (patch)
treed4655a8a657a154badfd91925e6c736ca911e3fd
parentf5671d390d0dfebec37f62bfff7228cd23cd1b59 (diff)
parent729c41e8f9de0c60edc3a4ba203943c6abeacb7e (diff)
Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev
-rw-r--r--services/core/java/com/android/server/Watchdog.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index e097d85293ab..4e416a27c8ea 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -63,7 +63,7 @@ public class Watchdog extends Thread {
static final String TAG = "Watchdog";
/** Debug flag. */
- public static final boolean DEBUG = true; // STOPSHIP disable it (b/113252928)
+ public static final boolean DEBUG = false;
// Set this to true to use debug default values.
static final boolean DB = false;
@@ -570,7 +570,7 @@ public class Watchdog extends Thread {
continue;
} else if (waitState == WAITED_HALF) {
if (!waitedHalf) {
- if (DEBUG) Slog.d(TAG, "WAITED_HALF");
+ Slog.i(TAG, "WAITED_HALF");
// We've waited half the deadlock-detection interval. Pull a stack
// trace and wait another half.
ArrayList<Integer> pids = new ArrayList<Integer>();