commit ac5b759433eb5f8667e9c5330233b95bb30855fc
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 26 05:32:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 26 05:32:50 2019 +0000
tree a948a72d12024c890b1c77a4bd2b13b75dd7bb69
parent 6f30b0626e353b6c486c6cc367b59d0c72359281
parent a4adfb19df934fd1e5f4f4b1a1c815ee209f02e0

Merge "surfaceflinger: Pass proper transform orientation to setProjection()"

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 4a13bfb..5700d72 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -272,13 +272,17 @@
         scissor = displayBounds;
     }
 
+    uint32_t transformOrientation;
+
     if (isPrimary()) {
         sPrimaryDisplayOrientation = displayStateOrientationToTransformOrientation(orientation);
+        transformOrientation = displayStateOrientationToTransformOrientation(
+                (orientation + mDisplayInstallOrientation) % (DisplayState::eOrientation270 + 1));
+    } else {
+        transformOrientation = displayStateOrientationToTransformOrientation(orientation);
     }
 
-    getCompositionDisplay()->setProjection(globalTransform,
-                                           displayStateOrientationToTransformOrientation(
-                                                   orientation),
+    getCompositionDisplay()->setProjection(globalTransform, transformOrientation,
                                            frame, viewport, scissor, needsFiltering);
 }