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

Commit 6e52b456 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix possible NPE in ViewRoot with GL rendering enabled. Bug #3257222"

parents a2584aa9 dbf78bdb

core/java/android/view/ViewRoot.java

+3 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,9 @@ public final class ViewRoot extends Handler implements ViewParent, 
                }

            }



            if (hwInitialized || (windowShouldResize && mAttachInfo.mHardwareRenderer != null)) {

            if (hwInitialized || (windowShouldResize &&

                    mAttachInfo.mHardwareRenderer != null &&

                    mAttachInfo.mHardwareRenderer.isEnabled())) {

                mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight);

            }