surfaceflinger: fix initial crop computation

This function computes the crop of the layer, that is, the region of
the layer to be drawn.  We must consider the size of the layer when
applying s.active.crop.

Bug: 63786936
Test: manual
Change-Id: I8000413beba54a054db8d7ad28e868d23b0167ab

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 0597556..1b864fd 100755 (executable)
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -474,7 +474,7 @@ Rect Layer::computeInitialCrop(const sp<const DisplayDevice>& hw) const {
 
     Rect activeCrop(s.active.w, s.active.h);
     if (!s.crop.isEmpty()) {
-        activeCrop = s.crop;
+        activeCrop.intersect(s.crop, &activeCrop);
     }
 
     Transform t = getTransform();