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

* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421
This commit is contained in:
Romain Guy
2011-11-22 12:35:18 -08:00
committed by Android Git Automerger

View File

@@ -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);