commit dbf78bdb7a9aed3b8393c247128a7e8c760343b5
author Romain Guy <romainguy@google.com> Tue Dec 07 17:04:03 2010 -0800
committer Romain Guy <romainguy@google.com> Tue Dec 07 17:04:03 2010 -0800
tree fbba371968e47673699ab5a2d58bfe8c6f178837
parent 331edf84e2815e309c558e7cedbc414fb23162ec

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

Change-Id: Ic11cbe5f06311627eb7eac4dfa8864b43651d904

core/java/android/view/ViewRoot.java

diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index a34fe87..53cff91 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -1101,7 +1101,9 @@
                 }
             }
 
-            if (hwInitialized || (windowShouldResize && mAttachInfo.mHardwareRenderer != null)) {
+            if (hwInitialized || (windowShouldResize &&
+                    mAttachInfo.mHardwareRenderer != null &&
+                    mAttachInfo.mHardwareRenderer.isEnabled())) {
                 mAttachInfo.mHardwareRenderer.setup(mWidth, mHeight);
             }