commit ab9e462966dfb738d9b4f00ed73ecbb8ad6c2df5
author Yiwei Zhang <zzyiwei@google.com> Sat Jun 29 04:03:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 29 04:03:17 2019 +0000
tree 65e2bb360e5ab0621f0f7b51f58aaab03426b7d2
parent feb6af0eaf391e16c95bf45273f2d37bebdadc43
parent 3c74da9ede3a50335ea1a5237d5565bb472e3141

Merge "GpuStats: move the stats send at Activity launch off UI thread" into qt-dev

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);
     }