Merge "Fix possible NPE in ViewRoot with GL rendering enabled. Bug #3257222"

2010-12-07 17:06:02 -08:00
parent a2584aa9a3 dbf78bdb7a
commit 6e52b45656
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -1101,7 +1101,9 @@ public final class ViewRoot extends Handler implements ViewParent,
                }
            }

-            if (hwInitialized || (windowShouldResize && mAttachInfo.mHardwareRenderer != null)) {
+            if (hwInitialized || (windowShouldResize &&
+                    mAttachInfo.mHardwareRenderer != null &&
+                    mAttachInfo.mHardwareRenderer.isEnabled())) {
                mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight);
            }