Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev

Romain Guy · Android (Google) Code Review · commit 6b5caee49085 · 2012-06-11T14:15:40.000-07:00
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
@@ -671,14 +671,15 @@ void destroyHardwareLayers() {
     }
 
     public boolean attachFunctor(int functor) {
+        //noinspection SimplifiableIfStatement
         if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {
             return mAttachInfo.mHardwareRenderer.attachFunctor(mAttachInfo, functor);
         }
         return false;
     }
 
     public void detachFunctor(int functor) {
-        if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {
+        if (mAttachInfo.mHardwareRenderer != null) {
             mAttachInfo.mHardwareRenderer.detachFunctor(functor);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -671,14 +671,15 @@ void destroyHardwareLayers() {`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`public boolean attachFunctor(int functor) {`
	`674`	`+ //noinspection SimplifiableIfStatement`
`674`	`675`	`if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {`
`675`	`676`	`return mAttachInfo.mHardwareRenderer.attachFunctor(mAttachInfo, functor);`
`676`	`677`	`}`
`677`	`678`	`return false;`
`678`	`679`	`}`
`679`	`680`
`680`	`681`	`public void detachFunctor(int functor) {`
`681`		`- if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {`
	`682`	`+ if (mAttachInfo.mHardwareRenderer != null) {`
`682`	`683`	`mAttachInfo.mHardwareRenderer.detachFunctor(functor);`
`683`	`684`	`}`
`684`	`685`	`}`