commit 5148c19dea3232e15f9a8cf249799d6c09fa0f95
author Chia-I Wu <olv@google.com> Fri Jul 21 15:32:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 15:32:21 2017 +0000
tree 5d608bfc5fa26198470907508d70b6c9cd867b08
parent 732ee9e17f7bbe843b652a45471f6b7eae353c55
parent 349abaf55fe201a99f75eff5060d81b783819951

Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev
am: 349abaf55f

Change-Id: Ied5b49f6089e2cd78ef53c9918d4e57c5231d504

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 8346e4b..b14fd7b 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();