Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '6b5caee49085c63b0197fd1e5e952f3b76abe33d':
  Prevent crash in WebView when disabling the hw renderer Bug #6596807
This commit is contained in:
Romain Guy
2012-06-12 12:42:32 -07:00
committed by Android Git Automerger
parent 5d15f40a19 6b5caee490
commit 265888fe6a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ViewRootImpl.java
View File

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