Merge "Fix NullPointerException on ThreadedRenderer" into sc-dev (eee7cc87) · Commits · e / os / android_frameworks_base

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);
	}		}
	}		}
	}		}