commit df7867f3f488222f3708fb00415fbf0fcf74eb97
author Chia-I Wu <olv@google.com> Thu Jul 20 14:24:37 2017 -0700
committer Chia-I Wu <olv@google.com> Thu Jul 20 14:30:39 2017 -0700
tree bbcbfb3498980419871589226f85cfe9cb2e0009
parent 53e5aa93fa2855616b9691c5e1878f1db1464ace

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

services/surfaceflinger/Layer.cpp

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