commit 99029548a4ad53b75dd5a9ec6cbecd8602dab48b
author Makoto Onuki <omakoto@google.com> Mon Aug 27 17:23:09 2018 -0700
committer Makoto Onuki <omakoto@google.com> Tue Aug 28 10:21:56 2018 -0700
tree 9f1699517637c9bfc1a170b0c367bc650d68e0b0
parent 0886e9092196fca659576db1be95ee0db04606f3

Temporarily enable ANR debug log to track down b/113252928

Bug: 113252928
Test: Manual tested with the debug code enabled w/ debug.trigger.watchdog
Change-Id: I15bbf01f0a239d04be465a097cfec02b2c0414b9

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

diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 713da30..aaca85b 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -17,34 +17,33 @@
 package com.android.server;
 
 import android.app.IActivityController;
-import android.os.Binder;
-import android.os.Build;
-import android.os.RemoteException;
-import android.system.ErrnoException;
-import android.system.Os;
-import android.system.OsConstants;
-import android.system.StructRlimit;
-import com.android.internal.os.ZygoteConnectionConstants;
-import com.android.server.am.ActivityManagerService;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hidl.manager.V1_0.IServiceManager;
+import android.os.Binder;
+import android.os.Build;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.IPowerManager;
 import android.os.Looper;
 import android.os.Process;
+import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
-import android.os.SystemProperties;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import android.system.StructRlimit;
 import android.util.EventLog;
 import android.util.Log;
 import android.util.Slog;
 
+import com.android.internal.os.ZygoteConnectionConstants;
+import com.android.server.am.ActivityManagerService;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -62,6 +61,8 @@
 public class Watchdog extends Thread {
     static final String TAG = "Watchdog";
 
+    private static final boolean DEBUG = true; // STOPSHIP disable it (b/113252928)
+
     // Set this to true to use debug default values.
     static final boolean DB = false;
 
@@ -478,6 +479,7 @@
                         continue;
                     } else if (waitState == WAITED_HALF) {
                         if (!waitedHalf) {
+                            if (DEBUG) Slog.d(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>();