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

Commit 78904d19 authored by Huihong Luo's avatar Huihong Luo Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException on ThreadedRenderer" into sc-dev am: eee7cc87 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14947021

Change-Id: I808038f91d1e07b4e01fefbb1798a580cd3d6b8e
parents 4d99e69e eee7cc87

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1410,8 +1410,6 @@ public final class ViewRootImpl implements ViewParent, 
                final boolean translucent = attrs.format != PixelFormat.OPAQUE || hasSurfaceInsets;

                final boolean translucent = attrs.format != PixelFormat.OPAQUE || hasSurfaceInsets;

                mAttachInfo.mThreadedRenderer = ThreadedRenderer.create(mContext, translucent,

                mAttachInfo.mThreadedRenderer = ThreadedRenderer.create(mContext, translucent,

                        attrs.getTitle().toString());

                        attrs.getTitle().toString());

                addASurfaceTransactionCallback();

                mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl);

                updateColorModeIfNeeded(attrs.getColorMode());

                updateColorModeIfNeeded(attrs.getColorMode());

                updateForceDarkMode();

                updateForceDarkMode();

                if (mAttachInfo.mThreadedRenderer != null) {

                if (mAttachInfo.mThreadedRenderer != null) {
@@ -1420,6 +1418,8 @@ public final class ViewRootImpl implements ViewParent, 
                    if (mHardwareRendererObserver != null) {

                    if (mHardwareRendererObserver != null) {

                        mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver);

                        mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver);

                    }

                    }

                    addASurfaceTransactionCallback();

                    mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl);

                }

                }

            }

            }

        }

        }