Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev (6b5caee4) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -671,6 +671,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		public boolean attachFunctor(int functor) {
		//noinspection SimplifiableIfStatement
		if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {
		return mAttachInfo.mHardwareRenderer.attachFunctor(mAttachInfo, functor);
		}
		@@ -678,7 +679,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		public void detachFunctor(int functor) {
		if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {
		if (mAttachInfo.mHardwareRenderer != null) {
		mAttachInfo.mHardwareRenderer.detachFunctor(functor);
		}
		}