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

Merge "Null check for early watchdog-caught thread hangs" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-20 22:18:19 +00:00
committed by Android (Google) Code Review
parent 6a0b4bb626 fa7c3689e3
commit f4c2cb6830
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,9 +617,13 @@ public class Watchdog extends Thread {
// deadlock and the watchdog as a whole to be ineffective) // deadlock and the watchdog as a whole to be ineffective)
Thread dropboxThread = new Thread("watchdogWriteToDropbox") { Thread dropboxThread = new Thread("watchdogWriteToDropbox") {
public void run() { public void run() {
mActivity.addErrorToDropBox( // If a watched thread hangs before init() is called, we don't have a
"watchdog", null, "system_server", null, null, null, // valid mActivity. So we can't log the error to dropbox.
subject, null, stack, null); if (mActivity != null) {
mActivity.addErrorToDropBox(
"watchdog", null, "system_server", null, null, null,
subject, null, stack, null);
}
StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject); StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject);
} }
}; };