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

Commit 3d21e44a authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

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

am: 595f89eb

Change-Id: I8e0ea20a661511fe6b1c49ec5cec631eee332cb4
parents 6ff6a9cf 595f89eb
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -617,9 +617,13 @@ public class Watchdog extends Thread {
            // deadlock and the watchdog as a whole to be ineffective)
            Thread dropboxThread = new Thread("watchdogWriteToDropbox") {
                    public void run() {
                        // If a watched thread hangs before init() is called, we don't have a
                        // valid mActivity. So we can't log the error to dropbox.
                        if (mActivity != null) {
                            mActivity.addErrorToDropBox(
                                    "watchdog", null, "system_server", null, null, null,
                                    subject, null, stack, null);
                        }
                        StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject);
                    }
                };