diff options
| author | Romain Guy <romainguy@google.com> | 2012-06-11 14:15:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 14:15:40 -0700 |
| commit | 6b5caee49085c63b0197fd1e5e952f3b76abe33d (patch) | |
| tree | 4095db7483faae913dda9e53f3788ff9aae2816c /core/java/android | |
| parent | f372e331e46bb9852520fa76c76f99ad99441893 (diff) | |
| parent | 527ee91b60426b5a344e9905c7f9a14d6d26219e (diff) | |
Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index b5fff8a4ce35..7eeb6d0c648f 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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); } } |