| commit | 349abaf55fe201a99f75eff5060d81b783819951 | [log] [tgz] |
|---|---|---|
| author | Chia-I Wu <olv@google.com> | Fri Jul 21 15:28:01 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 21 15:28:01 2017 +0000 |
| tree | 1ee5172fd3c326d2a0f8ca2a82c3b15840fcdc32 | |
| parent | 3eba4064efec313dd619e51c4f32cd40d8758d63 [diff] | |
| parent | df7867f3f488222f3708fb00415fbf0fcf74eb97 [diff] |
Merge "surfaceflinger: fix initial crop computation" into oc-dr1-dev
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();