commit 2df6be75f3404b7d9a44851261df6bbe942335aa
author Rob Carr <racarr@google.com> Thu Apr 08 19:23:09 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 08 19:23:09 2021 +0000
tree bfd949ead80d82d2b8abab90a7e70e8712a33744
parent 5ea461caa65d5fd21ae1cf9f2125481b5b3189af
parent e163dbc742f7f542765f2ce3ea0d4bd5fec7a0b7

Merge "SurfaceFlinger: Peek in current state for transform hint" into sc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 1b7158b..b33eca9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3361,8 +3361,12 @@
             }
         }
 
-        if (const auto display = getDefaultDisplayDeviceLocked()) {
-            lbc->updateTransformHint(display->getTransformHint());
+        if (const auto token = getInternalDisplayTokenLocked()) {
+            const ssize_t index = mCurrentState.displays.indexOfKey(token);
+            if (index >= 0) {
+                const DisplayDeviceState& state = mCurrentState.displays.valueAt(index);
+                lbc->updateTransformHint(ui::Transform::toRotationFlags(state.orientation));
+            }
         }
         if (outTransformHint) {
             *outTransformHint = lbc->getTransformHint();