diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-30 11:27:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 11:27:35 -0700 |
| commit | 02d7e489b2e195c290c47dfb2ab1f6f8df66cfe2 (patch) | |
| tree | 9e235aa6b157ad9680eac087ffbde9cbbea9c181 | |
| parent | c40db82a121936a4bab1ec0803efe4d42910e3a5 (diff) | |
| parent | a59558f476fc04b1f30fba466051718503009977 (diff) | |
| download | frameworks_base-02d7e489b2e195c290c47dfb2ab1f6f8df66cfe2.zip frameworks_base-02d7e489b2e195c290c47dfb2ab1f6f8df66cfe2.tar.gz frameworks_base-02d7e489b2e195c290c47dfb2ab1f6f8df66cfe2.tar.bz2 | |
Merge "check for null ViewRootImpl" into jb-dev
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index ca17d31..cb160f9 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -87,6 +87,7 @@ import android.view.View.MeasureSpec; import android.view.ViewConfiguration; import android.view.ViewGroup; import android.view.ViewParent; +import android.view.ViewRootImpl; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; @@ -5435,8 +5436,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc if (mWebView.isHardwareAccelerated()) { int drawGLFunction = nativeGetDrawGLFunction(mNativeClass); - if (drawGLFunction != 0) { - mWebView.getViewRootImpl().detachFunctor(drawGLFunction); + ViewRootImpl viewRoot = mWebView.getViewRootImpl(); + if (drawGLFunction != 0 && viewRoot != null) { + viewRoot.detachFunctor(drawGLFunction); } } } |