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

Commit f67e3448 authored by Olivier Gaillard's avatar Olivier Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Add the thread id to the Watchdog subjet."

parents cded2761 0aea9054
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -306,11 +306,13 @@ public class Watchdog implements Dumpable {
        }

        String describeBlockedStateLocked() {
            Thread thread = getThread();
            String threadIdentifier = thread.getName() + ", tid=" + thread.getId();
            if (mCurrentMonitor == null) {
                return "Blocked in handler on " + mName + " (" + getThread().getName() + ")";
                return "Blocked in handler on " + mName + " (" + threadIdentifier + ")";
            } else {
                return "Blocked in monitor " + mCurrentMonitor.getClass().getName()
                        + " on " + mName + " (" + getThread().getName() + ")";
                        + " on " + mName + " (" + threadIdentifier + ")";
            }
        }