From f557188dc835e0a1b108d56b30641510901ecf13 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sat, 24 Feb 2024 22:38:32 +0100
Subject: [PATCH] Create UhidManager only on first use

There is no need to create a UhidManager instance (with its thread) if
no UHID is used.

PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>
---
 .../java/com/genymobile/scrcpy/Controller.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/server/src/main/java/com/genymobile/scrcpy/Controller.java
index 5ba0c577..fd320d3f 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -26,7 +26,7 @@ public class Controller implements AsyncProcessor {
 
     private Thread thread;
 
-    private final UhidManager uhidManager;
+    private UhidManager uhidManager;
 
     private final Device device;
     private final ControlChannel controlChannel;
@@ -52,7 +52,13 @@ public class Controller implements AsyncProcessor {
         this.powerOn = powerOn;
         initPointers();
         sender = new DeviceMessageSender(controlChannel);
-        uhidManager = new UhidManager(sender);
+    }
+
+    private UhidManager getUhidManager() {
+        if (uhidManager == null) {
+            uhidManager = new UhidManager(sender);
+        }
+        return uhidManager;
     }
 
     private void initPointers() {
@@ -99,7 +105,9 @@ public class Controller implements AsyncProcessor {
                 Ln.e("Controller error", e);
             } finally {
                 Ln.d("Controller stopped");
-                uhidManager.closeAll();
+                if (uhidManager != null) {
+                    uhidManager.closeAll();
+                }
                 listener.onTerminated(true);
             }
         }, "control-recv");
@@ -195,10 +203,10 @@ public class Controller implements AsyncProcessor {
                 device.rotateDevice();
                 break;
             case ControlMessage.TYPE_UHID_CREATE:
-                uhidManager.open(msg.getId(), msg.getData());
+                getUhidManager().open(msg.getId(), msg.getData());
                 break;
             case ControlMessage.TYPE_UHID_INPUT:
-                uhidManager.writeInput(msg.getId(), msg.getData());
+                getUhidManager().writeInput(msg.getId(), msg.getData());
                 break;
             default:
                 // do nothing