Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1

core/java/android/view/View.java

@@ -10140,7 +10140,11 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
 
         switch (mLayerType) {
             case LAYER_TYPE_HARDWARE:
-                getHardwareLayer();
+                if (mAttachInfo.mHardwareRenderer != null &&
+                        mAttachInfo.mHardwareRenderer.isEnabled() &&
+                        mAttachInfo.mHardwareRenderer.validate()) {
+                    getHardwareLayer();
+                }
                 break;
             case LAYER_TYPE_SOFTWARE:
                 buildDrawingCache(true);