Merge "Include watchdog timeout configuration in dumpsys output" into tm-dev am: 85d5a6eb

import static com.android.server.Watchdog.HandlerCheckerAndTimeout.withCustomTimeout;

import static com.android.server.Watchdog.HandlerCheckerAndTimeout.withDefaultTimeout;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.IActivityController;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.os.UserHandle;

import android.provider.Settings;

import android.sysprop.WatchdogProperties;

import android.util.Dumpable;

import android.util.EventLog;

import android.util.Log;

import android.util.Slog;

import java.io.FileReader;

import java.io.FileWriter;

import java.io.IOException;

import java.io.PrintWriter;

import java.io.StringWriter;

import java.util.ArrayList;

import java.util.Arrays;

/**

 * This class calls its monitor every minute. Killing this process if they don't return

 **/

public class Watchdog {

public class Watchdog implements Dumpable {

    static final String TAG = "Watchdog";

    /** Debug flag. */

        }

        doSysRq('c');

    }

    @Override

    public void dump(@NonNull PrintWriter pw, @Nullable String[] args) {

        pw.print("WatchdogTimeoutMillis=");

        pw.println(mWatchdogTimeoutMillis);

    }

}

        t.traceBegin("StartWatchdog");

        final Watchdog watchdog = Watchdog.getInstance();

        watchdog.start();

        mDumper.addDumpable(watchdog);

        t.traceEnd();

        Slog.i(TAG, "Reading configuration...");