issue5542

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

Fixes #5537 <https://github.com/Genymobile/scrcpy/issues/5537>

.github/workflows/release.yml

@@ -42,10 +42,10 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
 
-      - name: Build
+      - name: Build scrcpy-server
         run: release/build_server.sh
 
-      - name: Upload artifact
+      - name: Upload scrcpy-server artifact
         uses: actions/upload-artifact@v4
         with:
           name: scrcpy-server
@@ -63,7 +63,7 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
 
-      - name: Build without gradle
+      - name: Build scrcpy-server without gradle
         run: server/build_without_gradle.sh
 
   test-client:
@@ -74,6 +74,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo apt update
           sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
              libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
              libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@@ -82,7 +83,7 @@ jobs:
       - name: Test
         run: release/test_client.sh
 
-  build-linux-x86_64:
+  build-linux:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -90,27 +91,28 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo apt update
           sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
              libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
              libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
              libv4l-dev
 
-      - name: Build
-        run: release/build_linux.sh x86_64
+      - name: Build linux
+        run: release/build_linux.sh
 
       # upload-artifact does not preserve permissions
       - name: Tar
         run: |
-            cd release/work/build-linux-x86_64
+            cd release/work/build-linux
             mkdir dist-tar
             cd dist-tar
             tar -C .. -cvf dist.tar.gz dist/
 
-      - name: Upload artifact
+      - name: Upload build-linux artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-linux-x86_64-intermediate
-          path: release/work/build-linux-x86_64/dist-tar/
+          name: build-linux-intermediate
+          path: release/work/build-linux/dist-tar/
 
   build-win32:
     runs-on: ubuntu-latest
@@ -120,6 +122,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo apt update
           sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
              libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
              libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@@ -128,7 +131,7 @@ jobs:
       - name: Workaround for old meson version run by Github Actions
         run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt
 
-      - name: Build
+      - name: Build win32
         run: release/build_windows.sh 32
 
       # upload-artifact does not preserve permissions
@@ -139,7 +142,7 @@ jobs:
             cd dist-tar
             tar -C .. -cvf dist.tar.gz dist/
 
-      - name: Upload artifact
+      - name: Upload build-win32 artifact
         uses: actions/upload-artifact@v4
         with:
           name: build-win32-intermediate
@@ -153,6 +156,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo apt update
           sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
              libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
              libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@@ -161,7 +165,7 @@ jobs:
       - name: Workaround for old meson version run by Github Actions
         run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt
 
-      - name: Build
+      - name: Build win64
         run: release/build_windows.sh 64
 
       # upload-artifact does not preserve permissions
@@ -172,13 +176,13 @@ jobs:
             cd dist-tar
             tar -C .. -cvf dist.tar.gz dist/
 
-      - name: Upload artifact
+      - name: Upload build-win64 artifact
         uses: actions/upload-artifact@v4
         with:
           name: build-win64-intermediate
           path: release/work/build-win64/dist-tar/
 
-  build-macos-aarch64:
+  build-macos:
     runs-on: macos-latest
     steps:
       - name: Checkout code
@@ -189,54 +193,27 @@ jobs:
             brew install meson ninja nasm libiconv zlib automake autoconf \
                 libtool
 
-      - name: Build
-        run: release/build_macos.sh aarch64
+      - name: Build macOS
+        run: release/build_macos.sh
 
       # upload-artifact does not preserve permissions
       - name: Tar
         run: |
-            cd release/work/build-macos-aarch64
+            cd release/work/build-macos
             mkdir dist-tar
             cd dist-tar
             tar -C .. -cvf dist.tar.gz dist/
 
-      - name: Upload artifact
+      - name: Upload build-macos artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-macos-aarch64-intermediate
-          path: release/work/build-macos-aarch64/dist-tar/
+          name: build-macos-intermediate
+          path: release/work/build-macos/dist-tar/
 
-  build-macos-x86_64:
-    runs-on: macos-13
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: brew install meson ninja nasm libiconv zlib automake
-             # autoconf and libtool are already installed on macos-13
-
-      - name: Build
-        run: release/build_macos.sh x86_64
-
-      # upload-artifact does not preserve permissions
-      - name: Tar
-        run: |
-            cd release/work/build-macos-x86_64
-            mkdir dist-tar
-            cd dist-tar
-            tar -C .. -cvf dist.tar.gz dist/
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-macos-x86_64-intermediate
-          path: release/work/build-macos-x86_64/dist-tar/
-
-  package-linux-x86_64:
+  package-linux:
     needs:
       - build-scrcpy-server
-      - build-linux-x86_64
+      - build-linux
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -248,25 +225,25 @@ jobs:
           name: scrcpy-server
           path: release/work/build-server/server/
 
-      - name: Download build-linux-x86_64
+      - name: Download build-linux
         uses: actions/download-artifact@v4
         with:
-          name: build-linux-x86_64-intermediate
-          path: release/work/build-linux-x86_64/dist-tar/
+          name: build-linux-intermediate
+          path: release/work/build-linux/dist-tar/
 
       # upload-artifact does not preserve permissions
       - name: Detar
         run: |
-            cd release/work/build-linux-x86_64
+            cd release/work/build-linux
             tar xf dist-tar/dist.tar.gz
 
-      - name: Package
-        run: release/package_client.sh linux-x86_64 tar.gz
+      - name: Package linux
+        run: release/package_client.sh linux tar.gz
 
-      - name: Upload release
+      - name: Upload linux release
         uses: actions/upload-artifact@v4
         with:
-          name: release-linux-x86_64
+          name: release-linux
           path: release/output/
 
   package-win32:
@@ -296,10 +273,10 @@ jobs:
             cd release/work/build-win32
             tar xf dist-tar/dist.tar.gz
 
-      - name: Package
+      - name: Package win32
         run: release/package_client.sh win32 zip
 
-      - name: Upload release
+      - name: Upload win32 release
         uses: actions/upload-artifact@v4
         with:
           name: release-win32
@@ -332,55 +309,19 @@ jobs:
             cd release/work/build-win64
             tar xf dist-tar/dist.tar.gz
 
-      - name: Package
+      - name: Package win64
         run: release/package_client.sh win64 zip
 
-      - name: Upload release
+      - name: Upload win64 release
         uses: actions/upload-artifact@v4
         with:
           name: release-win64
           path: release/output
 
-  package-macos-aarch64:
+  package-macos:
     needs:
       - build-scrcpy-server
-      - build-macos-aarch64
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download scrcpy-server
-        uses: actions/download-artifact@v4
-        with:
-          name: scrcpy-server
-          path: release/work/build-server/server/
-
-      - name: Download build-macos-aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: build-macos-aarch64-intermediate
-          path: release/work/build-macos-aarch64/dist-tar/
-
-      # upload-artifact does not preserve permissions
-      - name: Detar
-        run: |
-            cd release/work/build-macos-aarch64
-            tar xf dist-tar/dist.tar.gz
-
-      - name: Package
-        run: release/package_client.sh macos-aarch64 tar.gz
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-macos-aarch64
-          path: release/output/
-
-  package-macos-x86_64:
-    needs:
-      - build-scrcpy-server
-      - build-macos-x86_64
+      - build-macos
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -395,32 +336,31 @@ jobs:
       - name: Download build-macos
         uses: actions/download-artifact@v4
         with:
-          name: build-macos-x86_64-intermediate
-          path: release/work/build-macos-x86_64/dist-tar/
+          name: build-macos-intermediate
+          path: release/work/build-macos/dist-tar/
 
       # upload-artifact does not preserve permissions
       - name: Detar
         run: |
-            cd release/work/build-macos-x86_64
+            cd release/work/build-macos
             tar xf dist-tar/dist.tar.gz
 
-      - name: Package
-        run: release/package_client.sh macos-x86_64 tar.gz
+      - name: Package macos
+        run: release/package_client.sh macos tar.gz
 
-      - name: Upload release
+      - name: Upload macos release
         uses: actions/upload-artifact@v4
         with:
-          name: release-macos-x86_64
+          name: release-macos
           path: release/output/
 
   release:
     needs:
       - build-scrcpy-server
-      - package-linux-x86_64
+      - package-linux
       - package-win32
       - package-win64
-      - package-macos-aarch64
-      - package-macos-x86_64
+      - package-macos
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -432,10 +372,10 @@ jobs:
           name: scrcpy-server
           path: release/work/build-server/server/
 
-      - name: Download release-linux-x86_64
+      - name: Download release-linux
         uses: actions/download-artifact@v4
         with:
-          name: release-linux-x86_64
+          name: release-linux
           path: release/output/
 
       - name: Download release-win32
@@ -450,16 +390,10 @@ jobs:
           name: release-win64
           path: release/output/
 
-      - name: Download release-macos-aarch64
+      - name: Download release-macos
         uses: actions/download-artifact@v4
         with:
-          name: release-macos-aarch64
-          path: release/output/
-
-      - name: Download release-macos-x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: release-macos-aarch64
+          name: release-macos
           path: release/output/
 
       - name: Package server

doc/control.md

@@ -23,14 +23,20 @@ To control the device without mirroring:
 scrcpy --no-video --no-audio
 ```
 
-By default, mouse mode is switched to UHID if video mirroring is disabled (a
-relative mouse mode is required).
+By default, the mouse is disabled when video playback is turned off.
+
+To control the device using a relative mouse, enable UHID mouse mode:
+
+```bash
+scrcpy --no-video --no-audio --mouse=uhid
+scrcpy --no-video --no-audio -M  # short version
+```
 
 To also use a UHID keyboard, set it explicitly:
 
 ```bash
-scrcpy --no-video --no-audio --keyboard=uhid
-scrcpy --no-video --no-audio -K  # short version
+scrcpy --no-video --no-audio --mouse=uhid --keyboard=uhid
+scrcpy --no-video --no-audio -MK  # short version
 ```
 
 To use AOA instead (over USB only):

release/build_linux.sh

@@ -4,14 +4,7 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir
 
-ARCH="$1"
-if [[ $# != 1 ]]
-then
-    echo "Syntax: $0 <arch>" >&2
-    exit 1
-fi
-
-LINUX_BUILD_DIR="$WORK_DIR/build-linux-$ARCH"
+LINUX_BUILD_DIR="$WORK_DIR/build-linux"
 
 app/deps/adb_linux.sh
 app/deps/sdl.sh linux native static

release/build_macos.sh

@@ -4,14 +4,7 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir
 
-ARCH="$1"
-if [[ $# != 1 ]]
-then
-    echo "Syntax: $0 <arch>" >&2
-    exit 1
-fi
-
-MACOS_BUILD_DIR="$WORK_DIR/build-macos-$ARCH"
+MACOS_BUILD_DIR="$WORK_DIR/build-macos"
 
 app/deps/adb_macos.sh
 app/deps/sdl.sh macos native static

release/generate_checksums.sh

@@ -5,10 +5,9 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 
 cd "$OUTPUT_DIR"
 sha256sum "scrcpy-server-$VERSION" \
-    "scrcpy-linux-x86_64-$VERSION.tar.gz" \
+    "scrcpy-linux-$VERSION.tar.gz" \
     "scrcpy-win32-$VERSION.zip" \
     "scrcpy-win64-$VERSION.zip" \
-    "scrcpy-macos-aarch64-$VERSION.tar.gz" \
-    "scrcpy-macos-x86_64-$VERSION.tar.gz" \
+    "scrcpy-macos-$VERSION.tar.gz" \
         | tee SHA256SUMS.txt
 echo "Release checksums generated in $PWD/SHA256SUMS.txt"

release/package_client.sh

@@ -14,39 +14,39 @@ fi
 
 FORMAT=$2
 
-if [[ "$FORMAT" != zip && "$FORMAT" != tar.gz ]]
+if [[ "$2" != zip && "$2" != tar.gz ]]
 then
-    echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2
+    echo "Invalid format (expected zip or tar.gz): $2" >&2
     exit 1
 fi
 
 BUILD_DIR="$WORK_DIR/build-$1"
 ARCHIVE_DIR="$BUILD_DIR/release-archive"
-TARGET_DIRNAME="scrcpy-$1-$VERSION"
+TARGET="scrcpy-$1-$VERSION"
 
-rm -rf "$ARCHIVE_DIR/$TARGET_DIRNAME"
-mkdir -p "$ARCHIVE_DIR/$TARGET_DIRNAME"
+rm -rf "$ARCHIVE_DIR/$TARGET"
+mkdir -p "$ARCHIVE_DIR/$TARGET"
 
-cp -r "$BUILD_DIR/dist/." "$ARCHIVE_DIR/$TARGET_DIRNAME/"
-cp "$WORK_DIR/build-server/server/scrcpy-server" "$ARCHIVE_DIR/$TARGET_DIRNAME/"
+cp -r "$BUILD_DIR/dist/." "$ARCHIVE_DIR/$TARGET/"
+cp "$WORK_DIR/build-server/server/scrcpy-server" "$ARCHIVE_DIR/$TARGET/"
 
 mkdir -p "$OUTPUT_DIR"
 
 cd "$ARCHIVE_DIR"
-rm -f "$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT"
+rm -f "$OUTPUT_DIR/$TARGET.$FORMAT"
 
 case "$FORMAT" in
     zip)
-        zip -r "$OUTPUT_DIR/$TARGET_DIRNAME.zip" "$TARGET_DIRNAME"
+        zip -r "$OUTPUT_DIR/$TARGET.zip" "$TARGET"
         ;;
     tar.gz)
-        tar cvf "$OUTPUT_DIR/$TARGET_DIRNAME.tar.gz" "$TARGET_DIRNAME"
+        tar cvf "$OUTPUT_DIR/$TARGET.tar.gz" "$TARGET"
         ;;
     *)
         echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2
         exit 1
 esac
 
-rm -rf "$TARGET_DIRNAME"
+rm -rf "$TARGET"
 cd -
-echo "Generated '$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT'"
+echo "Generated '$OUTPUT_DIR/$TARGET.$FORMAT'"

release/release.sh

@@ -12,12 +12,12 @@ rm -rf output
 ./build_server.sh
 ./build_windows.sh 32
 ./build_windows.sh 64
-./build_linux.sh x86_64
+./build_linux.sh
 
 ./package_server.sh
 ./package_client.sh win32 zip
 ./package_client.sh win64 zip
-./package_client.sh linux-x86_64 tar.gz
+./package_client.sh linux tar.gz
 
 ./generate_checksums.sh
 

server/src/main/java/com/genymobile/scrcpy/CleanUp.java

@@ -207,13 +207,15 @@ public final class CleanUp {
             }
         }
 
-        if (displayId != Device.DISPLAY_ID_NONE && Device.isScreenOn(displayId)) {
+        // Change the power of the main display when mirroring a virtual display
+        int targetDisplayId = displayId != Device.DISPLAY_ID_NONE ? displayId : 0;
+        if (Device.isScreenOn(targetDisplayId)) {
             if (powerOffScreen) {
                 Ln.i("Power off screen");
-                Device.powerOffScreen(displayId);
+                Device.powerOffScreen(targetDisplayId);
             } else if (restoreDisplayPower) {
                 Ln.i("Restoring display power");
-                Device.setDisplayPower(displayId, true);
+                Device.setDisplayPower(targetDisplayId, true);
             }
         }
 

server/src/main/java/com/genymobile/scrcpy/control/Controller.java

@@ -281,7 +281,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 setClipboard(msg.getText(), msg.getPaste(), msg.getSequence());
                 break;
             case ControlMessage.TYPE_SET_DISPLAY_POWER:
-                if (supportsInputEvents && displayId != Device.DISPLAY_ID_NONE) {
+                if (supportsInputEvents) {
                     setDisplayPower(msg.getOn());
                 }
                 break;
@@ -356,16 +356,27 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
         // it hides the field on purpose, to read it with atomic access
         @SuppressWarnings("checkstyle:HiddenField")
         DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a touch event without a display";
+        // In scrcpy, displayData should never be null (a touch event can only be generated from the client on a video frame), but it is possible
+        // to send events without video playback using scrcpy-server alone (except for virtual displays).
+        assert displayData != null || displayId != Device.DISPLAY_ID_NONE : "Cannot receive a touch event without a display";
 
-        Point point = displayData.positionMapper.map(position);
-        if (point == null) {
-            if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                Size eventSize = position.getScreenSize();
-                Size currentSize = displayData.positionMapper.getVideoSize();
-                Ln.v("Ignore touch event generated for size " + eventSize + " (current size is " + currentSize + ")");
+        Point point;
+        int targetDisplayId;
+        if (displayData != null) {
+            point = displayData.positionMapper.map(position);
+            if (point == null) {
+                if (Ln.isEnabled(Ln.Level.VERBOSE)) {
+                    Size eventSize = position.getScreenSize();
+                    Size currentSize = displayData.positionMapper.getVideoSize();
+                    Ln.v("Ignore touch event generated for size " + eventSize + " (current size is " + currentSize + ")");
+                }
+                return false;
             }
-            return false;
+            targetDisplayId = displayData.virtualDisplayId;
+        } else {
+            // No display, use the raw coordinates
+            point = position.getPoint();
+            targetDisplayId = displayId;
         }
 
         int pointerIndex = pointersState.getPointerIndex(pointerId);
@@ -421,7 +432,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                     // First button pressed: ACTION_DOWN
                     MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(downEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(downEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -432,7 +443,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(pressEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(pressEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(pressEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -446,7 +457,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(releaseEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(releaseEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -454,7 +465,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                     // Last button released: ACTION_UP
                     MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(upEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(upEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -465,7 +476,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                 DEFAULT_DEVICE_ID, 0, source, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, targetDisplayId, Device.INJECT_MODE_ASYNC);
     }
 
     private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
@@ -691,9 +702,12 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
     }
 
     private void setDisplayPower(boolean on) {
-        boolean setDisplayPowerOk = Device.setDisplayPower(displayId, on);
+        // Change the power of the main display when mirroring a virtual display
+        int targetDisplayId = displayId != Device.DISPLAY_ID_NONE ? displayId : 0;
+        boolean setDisplayPowerOk = Device.setDisplayPower(targetDisplayId, on);
         if (setDisplayPowerOk) {
-            keepDisplayPowerOff = !on;
+            // Do not keep display power off for virtual displays: MOD+p must wake up the physical device
+            keepDisplayPowerOff = displayId != Device.DISPLAY_ID_NONE && !on;
             Ln.i("Device display turned " + (on ? "on" : "off"));
             if (cleanUp != null) {
                 boolean mustRestoreOnExit = !on;

server/src/main/java/com/genymobile/scrcpy/device/Device.java

@@ -40,6 +40,10 @@ public final class Device {
     public static final int INJECT_MODE_WAIT_FOR_RESULT = InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_RESULT;
     public static final int INJECT_MODE_WAIT_FOR_FINISH = InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH;
 
+    // The new display power method introduced in Android 15 does not work as expected:
+    // <https://github.com/Genymobile/scrcpy/issues/5530>
+    private static final boolean USE_ANDROID_15_DISPLAY_POWER = false;
+
     private Device() {
         // not instantiable
     }
@@ -127,7 +131,7 @@ public final class Device {
     public static boolean setDisplayPower(int displayId, boolean on) {
         assert displayId != Device.DISPLAY_ID_NONE;
 
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
+        if (USE_ANDROID_15_DISPLAY_POWER && Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
             return ServiceManager.getDisplayManager().requestDisplayPower(displayId, on);
         }
 

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 {