Merge "Better handle op size edge cases"

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 5cf029dc4ab5..73d458def5e4 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1407,9 +1407,9 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDef
             }
             state.mBounds.set(clippedBounds);
         } else {
-            // If we don't have bounds, let's assume we're clipped
-            // to prevent merging
-            state.mClipSideFlags = kClipSide_Full;
+            // Empty bounds implies size unknown. Label op as conservatively clipped to disable
+            // overdraw avoidance (since we don't know what it overlaps)
+            state.mClipSideFlags = kClipSide_ConservativeFull;
             state.mBounds.set(currentClip);
         }
     }