Merge "Fix logging" into lmp-dev

2014-07-17 18:12:51 +00:00
parent 84cca777e2 5cdb8f998c
commit 21f61b7d87
1 changed files with 1 additions and 1 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -185,7 +185,7 @@ void CanvasContext::draw() {
    } else if (!mDirtyRegionsEnabled || mHaveNewSurface) {
        dirty.setEmpty();
    } else {
-        if (!dirty.intersect(0, 0, width, height)) {
+        if (!dirty.isEmpty() && !dirty.intersect(0, 0, width, height)) {
            ALOGW("Dirty " RECT_STRING " doesn't intersect with 0 0 %d %d ?",
                    SK_RECT_ARGS(dirty), width, height);
            dirty.setEmpty();