Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e13e05a authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev 

am: c1fb7dd2

Change-Id: I7685f50eced23924007ca5c7e7735ffeeb45222c
parents 90b70e5c c1fb7dd2

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

+2 −2
Original line number Diff line number Diff line
@@ -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>();