| commit | c51c65c97c1693b27995ba3cd70452b40d58b4be | [log] [tgz] |
|---|---|---|
| author | Chia-I Wu <olv@google.com> | Fri Jul 21 15:34:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 15:34:51 2017 +0000 |
| tree | f3d43522de84bc10ceb88a1b5ca01c9289037c91 | |
| parent | 9af229146dff8ed9b78bba184a515b59ddb07836 [diff] | |
| parent | 5148c19dea3232e15f9a8cf249799d6c09fa0f95 [diff] |
Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev am: 349abaf55f am: 5148c19dea Change-Id: I81c154c63764fa04564342f1b438d706e5759910
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();