Display and control your Android device
Compute screen size without DisplayInfo instance
Romain Vimont162043911e1d
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.javaindex ba833a06..419e996e 100644--- a/server/src/main/java/com/genymobile/scrcpy/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java@@ -69,7 +69,8 @@ public final class Device {int displayInfoFlags = displayInfo.getFlags();- screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockVideoOrientation());+ screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), displayInfo.getSize(), options.getCrop(), options.getMaxSize(),+ options.getLockVideoOrientation());layerStack = displayInfo.getLayerStack();SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java b/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.javaindex c27322ef..8e5b401f 100644--- a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java@@ -80,15 +80,12 @@ public final class ScreenInfo {return new ScreenInfo(newContentRect, newUnlockedVideoSize, newDeviceRotation, lockedVideoOrientation);}- public static ScreenInfo computeScreenInfo(DisplayInfo displayInfo, Rect crop, int maxSize, int lockedVideoOrientation) {- int rotation = displayInfo.getRotation();-+ public static ScreenInfo computeScreenInfo(int rotation, Size deviceSize, Rect crop, int maxSize, int lockedVideoOrientation) {if (lockedVideoOrientation == Device.LOCK_VIDEO_ORIENTATION_INITIAL) {// The user requested to lock the video orientation to the current orientationlockedVideoOrientation = rotation;}- Size deviceSize = displayInfo.getSize();Rect contentRect = new Rect(0, 0, deviceSize.getWidth(), deviceSize.getHeight());if (crop != null) {if (rotation % 2 != 0) { // 180s preserve dimensions