commit f93ad188411d05ee688c32ec1707a6ac105515a7
author Chavi Weingarten <chaviw@google.com> Thu Aug 15 18:01:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 15 18:01:22 2019 +0000
tree 23ff5ee6cc546abe04675fe28d84c4aa115c7dbd
parent 7704a15ded89176ca7d7a8f4dd83cda172be2f69
parent 810b03095e91b6ed1bd96b739206f867ccd4c022

Merge "SF: Revert one line that changed in moving doComposeSurfaces"

services/surfaceflinger/CompositionEngine/src/Output.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index fb576e0..55fdacd 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -315,7 +315,7 @@
     const bool supportsProtectedContent = renderEngine.supportsProtectedContent();
 
     renderengine::DisplaySettings clientCompositionDisplay;
-    clientCompositionDisplay.physicalDisplay = mState.frame;
+    clientCompositionDisplay.physicalDisplay = mState.scissor;
     clientCompositionDisplay.clip = mState.scissor;
     clientCompositionDisplay.globalTransform = mState.transform.asMatrix4();
     clientCompositionDisplay.orientation = mState.orientation;