From 7a3fe830d4d85d02ec21a23b88d8b48ce798a13e Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 2 May 2025 23:03:15 +0200
Subject: [PATCH] Synchronize access to DisplayManager

The DisplayManager and its method getDisplayInfo() may be used from both
the Controller thread and the video (main) thread.

PR #6009 <https://github.com/Genymobile/scrcpy/pull/6009>
---
 .../java/com/genymobile/scrcpy/wrappers/DisplayManager.java    | 3 ++-
 .../java/com/genymobile/scrcpy/wrappers/ServiceManager.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
index 3f8ed2bd..2f86bbd2 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@@ -115,7 +115,8 @@ public final class DisplayManager {
         return flags;
     }
 
-    private Method getGetDisplayInfoMethod() throws NoSuchMethodException {
+    // getDisplayInfo() may be used from both the Controller thread and the video (main) thread
+    private synchronized Method getGetDisplayInfoMethod() throws NoSuchMethodException {
         if (getDisplayInfoMethod == null) {
             getDisplayInfoMethod = manager.getClass().getMethod("getDisplayInfo", int.class);
         }
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
index a8a56dab..b1123b55 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
@@ -54,7 +54,8 @@ public final class ServiceManager {
         return windowManager;
     }
 
-    public static DisplayManager getDisplayManager() {
+    // The DisplayManager may be used from both the Controller thread and the video (main) thread
+    public static synchronized DisplayManager getDisplayManager() {
         if (displayManager == null) {
             displayManager = DisplayManager.create();
         }