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

Commit e978e2f4 authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when inflating view on BG thread" into main

parents 3e624591 544a8e23

core/java/android/view/LayoutInflater.java

+3 −2
Original line number Diff line number Diff line
@@ -516,8 +516,9 @@ public abstract class LayoutInflater { 
            mConstructorArgs[0] = inflaterContext;

            View result = root;



            if (root != null && root.getViewRootImpl() != null) {

                root.getViewRootImpl().notifyRendererOfExpensiveFrame();

            ViewRootImpl viewRootImpl = root != null ? root.getViewRootImpl() : null;

            if (viewRootImpl != null) {

                viewRootImpl.notifyRendererOfExpensiveFrame();

            }



            try {