diff options
| author | Huihong Luo <huisinro@google.com> | 2021-06-11 11:17:44 -0700 |
|---|---|---|
| committer | Huihong Luo <huisinro@google.com> | 2021-06-11 11:20:32 -0700 |
| commit | 1c3d52c1304c070384970925fdf4ea461f357b17 (patch) | |
| tree | 5d82a9f50e895f7ac1e9490fcf4f04b43a48a04b /core/java/android/view/ViewRootImpl.java | |
| parent | c0115519f6be9ef2ce336998d687893974aa0e57 (diff) | |
Fix NullPointerException on ThreadedRenderer
The variable, mAttachInfo.mThreadedRenderer, might be null.
Bug: 188614814
Test: run x86_64 cts test: CtsInputMethodTestCases
Change-Id: I5c441d8948dd357992ad5ef94d03deff547baa37
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 86380a294a3d..d42e0c367763 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1410,8 +1410,6 @@ public final class ViewRootImpl implements ViewParent, final boolean translucent = attrs.format != PixelFormat.OPAQUE || hasSurfaceInsets; mAttachInfo.mThreadedRenderer = ThreadedRenderer.create(mContext, translucent, attrs.getTitle().toString()); - addASurfaceTransactionCallback(); - mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl); updateColorModeIfNeeded(attrs.getColorMode()); updateForceDarkMode(); if (mAttachInfo.mThreadedRenderer != null) { @@ -1420,6 +1418,8 @@ public final class ViewRootImpl implements ViewParent, if (mHardwareRendererObserver != null) { mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver); } + addASurfaceTransactionCallback(); + mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl); } } } |