Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include watchdog timeout configuration in dumpsys output" into tm-dev

Browse Source
This commit is contained in:
Jing Ji
2022-05-12 18:27:01 +00:00
committed by Android (Google) Code Review
parent 91604b8ef0 0d9ea1b08d
commit 85d5a6eb1d
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/Watchdog.java
View File

@@ -19,6 +19,8 @@ package com.android.server;
import static com.android.server.Watchdog.HandlerCheckerAndTimeout.withCustomTimeout; import static com.android.server.Watchdog.HandlerCheckerAndTimeout.withCustomTimeout;
import static com.android.server.Watchdog.HandlerCheckerAndTimeout.withDefaultTimeout; import static com.android.server.Watchdog.HandlerCheckerAndTimeout.withDefaultTimeout;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.IActivityController; import android.app.IActivityController;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -43,6 +45,7 @@ import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.sysprop.WatchdogProperties; import android.sysprop.WatchdogProperties;
import android.util.Dumpable;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.Slog; import android.util.Slog;
@@ -63,6 +66,7 @@ import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; 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 * 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"; static final String TAG = "Watchdog";
/** Debug flag. */ /** Debug flag. */
@@ -1028,4 +1032,10 @@ public class Watchdog {
} }
doSysRq('c'); doSysRq('c');
} }
@Override
public void dump(@NonNull PrintWriter pw, @Nullable String[] args) {
pw.print("WatchdogTimeoutMillis=");
pw.println(mWatchdogTimeoutMillis);
}
} }

1
services/java/com/android/server/SystemServer.java
View File

@@ -1057,6 +1057,7 @@ public final class SystemServer implements Dumpable {
t.traceBegin("StartWatchdog"); t.traceBegin("StartWatchdog");
final Watchdog watchdog = Watchdog.getInstance(); final Watchdog watchdog = Watchdog.getInstance();
watchdog.start(); watchdog.start();
mDumper.addDumpable(watchdog);
t.traceEnd(); t.traceEnd();
Slog.i(TAG, "Reading configuration..."); Slog.i(TAG, "Reading configuration...");