commit 63abc2ba757b4ce008ca50caad8c70c768be7137
author Dominik Laskowski <domlaskowski@google.com> Thu Dec 21 19:33:25 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 21 19:33:25 2023 +0000
tree af6e74e230daeec1f94709ec97935cbc49aa14ec
parent aaab4c3b4f012f48bca428b9db1cd954a6fbc8e9

Revert "SF: Flow DisplayModeRequest through mode set FSM"

This reverts commit aaab4c3b4f012f48bca428b9db1cd954a6fbc8e9.

Reason for revert: b/317378302

Change-Id: I516f52c41d27d9ea3eca969a3f786d2115521dac

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index d2db685..6b44401 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -725,9 +725,9 @@
     void initiateDisplayModeChanges() REQUIRES(mStateLock, kMainThreadContext);
     void finalizeDisplayModeChange(DisplayDevice&) REQUIRES(mStateLock, kMainThreadContext);
 
-    // TODO(b/241285191): Move to Scheduler.
-    void dropModeRequest(display::DisplayModeRequest&&) REQUIRES(mStateLock);
-    void applyActiveMode(display::DisplayModeRequest&&) REQUIRES(mStateLock);
+    // TODO(b/241285191): Replace DisplayDevice with DisplayModeRequest, and move to Scheduler.
+    void dropModeRequest(const sp<DisplayDevice>&) REQUIRES(mStateLock);
+    void applyActiveMode(const sp<DisplayDevice>&) REQUIRES(mStateLock);
 
     // Called on the main thread in response to setPowerMode()
     void setPowerModeInternal(const sp<DisplayDevice>& display, hal::PowerMode mode)