From 3e689020baa1b3ea1b66cba3260a7a33be458a06 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Wed, 27 Nov 2024 07:45:35 +0100
Subject: [PATCH] Fix null return value in DisplayManager.toString()

Ensure DisplayListener.toString() returns a non-null value to prevent a
NullPointerException on certain devices.

Fixes #5537 <https://github.com/Genymobile/scrcpy/issues/5537>
---
 .../java/com/genymobile/scrcpy/wrappers/DisplayManager.java    | 3 +++
 1 file changed, 3 insertions(+)

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 b497e97f..d44ac608 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@@ -192,6 +192,9 @@ public final class DisplayManager {
                         if ("onDisplayChanged".equals(method.getName())) {
                             listener.onDisplayChanged((int) args[0]);
                         }
+                        if ("toString".equals(method.getName())) {
+                            return "DisplayListener";
+                        }
                         return null;
                     });
             try {