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

Commit 4846a93b authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Only call dump when a ViewRoot actually exists" into klp-dev

parents 17d28ca3 5f48dc74

core/java/android/app/Activity.java

+5 −1
Original line number Diff line number Diff line
@@ -4857,7 +4857,11 @@ public class Activity extends ContextThemeWrapper 


        mFragments.dump(prefix, fd, writer, args);



        getWindow().getDecorView().getViewRootImpl().dump(prefix, fd, writer, args);

        if (getWindow() != null &&

                getWindow().peekDecorView() != null &&

                getWindow().peekDecorView().getViewRootImpl() != null) {

            getWindow().peekDecorView().getViewRootImpl().dump(prefix, fd, writer, args);

        }



        mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix);

    }