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

Commit 0d9ea1b0 authored by Jing Ji's avatar Jing Ji
Browse files

Include watchdog timeout configuration in dumpsys output

Bug: 209932320
Test: dumpsys
Change-Id: I682c6749b0a5c7c25e1ca9109ce187e28d70697f
parent bbd351fe
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.server;
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;
@@ -43,6 +45,7 @@ import android.os.SystemProperties;
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;
@@ -63,6 +66,7 @@ import java.io.FileNotFoundException;
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;
@@ -76,7 +80,7 @@ import java.util.concurrent.TimeUnit;
/**
 * 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. */
@@ -1028,4 +1032,10 @@ public class Watchdog {
        }
        doSysRq('c');
    }

    @Override
    public void dump(@NonNull PrintWriter pw, @Nullable String[] args) {
        pw.print("WatchdogTimeoutMillis=");
        pw.println(mWatchdogTimeoutMillis);
    }
}
+1 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ public final class SystemServer implements Dumpable {
        t.traceBegin("StartWatchdog");
        final Watchdog watchdog = Watchdog.getInstance();
        watchdog.start();
        mDumper.addDumpable(watchdog);
        t.traceEnd();

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