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

Commit fa7c3689 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Null check for early watchdog-caught thread hangs 

In case a watched thread hangs before we even get to
initialize the Watchdog, skip logging the dropbox
entry.

Bug: 132005148
Test: Boots
Change-Id: I272adb34ea44f61e266b8fb6d8d5b8f3e86477ae
parent d166d21f

services/core/java/com/android/server/Watchdog.java

+7 −3
Original line number Diff line number Diff line
@@ -548,9 +548,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);

                    }

                };