commit b9ff23eeae22af8bf167b09928797b15b41c31f4
author Peiyong Lin <lpy@google.com> Mon Apr 08 11:04:59 2019 -0700
committer Peiyong Lin <lpy@google.com> Mon Apr 08 11:07:07 2019 -0700
tree 7743c7bc45628d3c18add4222e28f67115176f50
parent 8f16f41c838d22debe12491eed409c0d1dc03112

[RoundedCorners] Avoid using invalid crop.

BUG: 125916918
Test: Verify with Youtube, Photos, Chrome and Camera.
Change-Id: I7d85ec2d9861a60ed8b1cc0c853107d6bef8a552

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 1142df8..b358437 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1804,8 +1804,9 @@
         }
     }
     const float radius = getDrawingState().cornerRadius;
-    return radius > 0 ? RoundedCornerState(getCrop(getDrawingState()).toFloatRect(), radius)
-                      : RoundedCornerState();
+    return radius > 0 && getCrop(getDrawingState()).isValid()
+            ? RoundedCornerState(getCrop(getDrawingState()).toFloatRect(), radius)
+            : RoundedCornerState();
 }
 
 void Layer::commitChildList() {