commit 2d7e7f886d7951b3798555f0d77bb55aadb48940
author Bart Sears <bsears@google.com> Sat Jul 13 19:42:29 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 13 19:42:29 2024 +0000
tree c497d1aa2539967b4a399be1a50b0aceb700c5e6
parent c5995852a2754e6ece980db63a5effaaabcceab9

Revert "SF: Fix deadlock during display hotplug"

This reverts commit c5995852a2754e6ece980db63a5effaaabcceab9.

Reason for revert: May be causing b/352809251

Bug: b/352809251
Change-Id: I650e757b84caae6960ec5c4d7912eabe31550492

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 65bfce2..8242844 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -733,7 +733,7 @@
     // Show hdr sdr ratio overlay
     bool mHdrSdrRatioOverlay = false;
 
-    void setDesiredMode(display::DisplayModeRequest&&);
+    void setDesiredMode(display::DisplayModeRequest&&) REQUIRES(mStateLock);
 
     status_t setActiveModeFromBackdoor(const sp<display::DisplayToken>&, DisplayModeId, Fps minFps,
                                        Fps maxFps);