commit d815ba21769687f685dc89a852efc8d35198977a
author Marin Shalamanov <shalamanov@google.com> Wed May 27 04:48:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 27 04:48:29 2020 +0000
tree 20b6b5ad762ef323d1624ba55979ca414393e5ab
parent 539c997d413949e2ff5713d377f4a186b9c68f2e
parent c7f9e4eea2c97ed653df990a38a92feca55c5db8

[SF] Make sure destination clip is contained in display bounds am: c7f9e4eea2

Change-Id: I4712fe45bdfa3027e4502bb0794dc622c7c5a403

services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp b/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp
index ca5be48..4835aef 100644
--- a/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp
@@ -38,6 +38,7 @@
 
     out.append("\n   ");
 
+    dumpVal(out, "bounds", bounds);
     dumpVal(out, "frame", frame);
     dumpVal(out, "viewport", viewport);
     dumpVal(out, "sourceClip", sourceClip);

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 0c8aafc..730f297 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -227,6 +227,8 @@
     if (destinationClip.isEmpty()) {
         destinationClip = displayBounds;
     }
+    // Make sure the destination clip is contained in the display bounds
+    destinationClip.intersect(displayBounds, &destinationClip);
 
     uint32_t transformOrientation;