commit cfaaceb8952a4f0eef11adb2978d3f5caf52b800
author Dominik Laskowski <domlaskowski@google.com> Sun Aug 04 16:02:58 2024 -0400
committer Dominik Laskowski <domlaskowski@google.com> Thu Aug 22 10:55:27 2024 -0400
tree 1401a0d3efe92e51f720dbaea17b643905f7650e
parent e37c04eeba1fd1deb457cc64a32c79070179273a

SF: Fall back to pacesetter in getDisplayStats

This does not change behavior, because the active display is the same as
the pacesetter for now.

Bug: 255635821
Bug: 277364366
Flag: EXEMPT refactor
Test: presubmit
Change-Id: I2a9be0092f9cc10667d06bdb8bf2f35b8c2b327f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 255209d..0c297d9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1280,20 +1280,14 @@
         return BAD_VALUE;
     }
 
+    // TODO: b/277364366 - Require a display token from clients and remove fallback to pacesetter.
     std::optional<PhysicalDisplayId> displayIdOpt;
-    {
+    if (displayToken) {
         Mutex::Autolock lock(mStateLock);
-        if (displayToken) {
-            displayIdOpt = getPhysicalDisplayIdLocked(displayToken);
-            if (!displayIdOpt) {
-                ALOGW("%s: Invalid physical display token %p", __func__, displayToken.get());
-                return NAME_NOT_FOUND;
-            }
-        } else {
-            // TODO (b/277364366): Clients should be updated to pass in the display they
-            // want, rather than us picking an arbitrary one (the active display, in this
-            // case).
-            displayIdOpt = mActiveDisplayId;
+        displayIdOpt = getPhysicalDisplayIdLocked(displayToken);
+        if (!displayIdOpt) {
+            ALOGW("%s: Invalid physical display token %p", __func__, displayToken.get());
+            return NAME_NOT_FOUND;
         }
     }