Display and control your Android device
Register rotation watcher on selected display
Kostiantyn Luzanc1ebea26e648
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.javaindex cbe294af..afa9f165 100644--- a/server/src/main/java/com/genymobile/scrcpy/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java@@ -67,7 +67,7 @@ public final class Device {}}}- });+ }, displayId);if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");@@ -138,8 +138,8 @@ public final class Device {return serviceManager.getPowerManager().isScreenOn();}- public void registerRotationWatcher(IRotationWatcher rotationWatcher) {- serviceManager.getWindowManager().registerRotationWatcher(rotationWatcher);+ public void registerRotationWatcher(IRotationWatcher rotationWatcher, int displayId) {+ serviceManager.getWindowManager().registerRotationWatcher(rotationWatcher, displayId);}public synchronized void setRotationListener(RotationListener rotationListener) {diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.javaindex cc687cd5..faa366a5 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java@@ -93,13 +93,13 @@ public final class WindowManager {}}- public void registerRotationWatcher(IRotationWatcher rotationWatcher) {+ public void registerRotationWatcher(IRotationWatcher rotationWatcher, int displayId) {try {Class<?> cls = manager.getClass();try {// display parameter added since this commit:// https://android.googlesource.com/platform/frameworks/base/+/35fa3c26adcb5f6577849fd0df5228b1f67cf2c6%5E%21/#F1- cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, 0);+ cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, displayId);} catch (NoSuchMethodException e) {// old versioncls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);