From dbf78bdb7a9aed3b8393c247128a7e8c760343b5 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Tue, 7 Dec 2010 17:04:03 -0800
Subject: [PATCH] Fix possible NPE in ViewRoot with GL rendering enabled. Bug
 #3257222

Change-Id: Ic11cbe5f06311627eb7eac4dfa8864b43651d904
---
 core/java/android/view/ViewRoot.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index a34fe8797b62b..53cff9128c311 100644
--- 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);
             }