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 <#4473>
Genymobile · Feb 29, 2024 · f557188 · f557188
1 parent 87da68e
commit f557188
Showing 1 changed file with 13 additions and 5 deletions.
diff --git 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 Controller(Device device, ControlChannel controlChannel, CleanUp cleanUp,
         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 void start(TerminationListener listener) {
                 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 @@ private boolean handleEvent() throws IOException {
                 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