commit 381ac014109fcaed943a47395a65df64a01ea062
author Peiyong Lin <lpy@google.com> Tue Apr 09 16:35:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 09 16:35:36 2019 +0000
tree 7e828df5858498253911eacd12974da9c57f0abb
parent 93822a0508dfc42936314f50536c9813cfa5f3fd
parent b9ff23eeae22af8bf167b09928797b15b41c31f4

Merge "[RoundedCorners] Avoid using invalid crop." into qt-dev

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 8736fa5..0211df9 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1810,8 +1810,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() {