commit 57e206513f87b5af6b0a32ca6e9f245cd5b78040
author Alec Mouri <alecmouri@google.com> Mon Jun 24 13:17:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 24 13:17:31 2019 -0700
tree df8fa61d5b24790270430bb624e792e5cc2a8a73
parent b796a031fdf2fbf1cb472c26de3766b2858c6c9b
parent feb6af0eaf391e16c95bf45273f2d37bebdadc43

Merge "[SurfaceFlinger] Fix screenshot orientation in landscape" into qt-dev
am: feb6af0eaf

Change-Id: I4166bbfdf23e37e5b77fccc80dd7d09698014a3c

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 60c6e4e..459cd0a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5665,6 +5665,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);
     }