commit deead5ecbe2ce815b475fadadffdf97194db131e
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 25 12:47:05 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 25 12:47:05 2019 +0000
tree d82ce4a49c893dd71bfc3041640264f2975d876a
parent c83cb1147cc358cc3c73100c9e117a37240420d3
parent feb6af0eaf391e16c95bf45273f2d37bebdadc43

Snap for 5685999 from feb6af0eaf391e16c95bf45273f2d37bebdadc43 to qt-release

Change-Id: Ic056e15d0f8e4d55078146df310f109dc528d806

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2579225..2d31910 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5613,6 +5613,11 @@
 
         captureOrientation = fromSurfaceComposerRotation(
                 static_cast<ISurfaceComposer::Rotation>(display->getOrientation()));
+        if (captureOrientation == ui::Transform::orientation_flags::ROT_90) {
+            captureOrientation = ui::Transform::orientation_flags::ROT_270;
+        } else if (captureOrientation == ui::Transform::orientation_flags::ROT_270) {
+            captureOrientation = ui::Transform::orientation_flags::ROT_90;
+        }
         *outDataspace =
                 pickDataspaceFromColorMode(display->getCompositionDisplay()->getState().colorMode);
     }