Merge "Don't crash when omitting paint to drawBitmap() with A8 configs."

2011-03-23 17:19:24 -07:00
parent 2a5fbcd6b1 5b7a3150a6
commit 9a9e8eefec
1 changed files with 3 additions and 1 deletions
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1099,7 +1099,9 @@ void OpenGLRenderer::drawAlphaBitmap(Texture* texture, float left, float top, Sk

    setupDraw();
    setupDrawWithTexture(true);
-    setupDrawAlpha8Color(paint->getColor(), alpha);
+    if (paint) {
+        setupDrawAlpha8Color(paint->getColor(), alpha);
+    }
    setupDrawColorFilter();
    setupDrawShader();
    setupDrawBlending(true, mode);