Fix freeze and thaw rotation for Android 15

Refs <670fb7f5c0%5E%21/>
PR #4740 <https://github.com/Genymobile/scrcpy/pull/4740>

Signed-off-by: Romain Vimont <rom@rom1v.com>

app/src/scrcpy.c

@@ -805,12 +805,9 @@ scrcpy(struct scrcpy_options *options) {
     ret = event_loop(s);
     LOGD("quit...");
 
-    if (options->video_playback) {
-        // Close the window immediately on closing, because screen_destroy()
-        // may only be called once the video demuxer thread is joined (it may
-        // take time)
-        sc_screen_hide_window(&s->screen);
-    }
+    // Close the window immediately on closing, because screen_destroy() may
+    // only be called once the video demuxer thread is joined (it may take time)
+    sc_screen_hide_window(&s->screen);
 
 end:
     if (timeout_started) {

server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java

@@ -49,9 +49,7 @@ public final class WindowManager {
     private Method getFreezeDisplayRotationMethod() throws NoSuchMethodException {
         if (freezeDisplayRotationMethod == null) {
             try {
-                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
-                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
-                freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
+                freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
                 freezeDisplayRotationMethodVersion = 0;
             } catch (NoSuchMethodException e) {
                 try {
@@ -60,7 +58,9 @@ public final class WindowManager {
                     freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
                     freezeDisplayRotationMethodVersion = 1;
                 } catch (NoSuchMethodException e1) {
-                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
+                    // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
+                    // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
+                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
                     freezeDisplayRotationMethodVersion = 2;
                 }
             }
@@ -71,12 +71,12 @@ public final class WindowManager {
     private Method getIsDisplayRotationFrozenMethod() throws NoSuchMethodException {
         if (isDisplayRotationFrozenMethod == null) {
             try {
+                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
+                isDisplayRotationFrozenMethodVersion = 0;
+            } catch (NoSuchMethodException e) {
                 // New method added by this commit:
                 // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
                 isDisplayRotationFrozenMethod = manager.getClass().getMethod("isDisplayRotationFrozen", int.class);
-                isDisplayRotationFrozenMethodVersion = 0;
-            } catch (NoSuchMethodException e) {
-                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
                 isDisplayRotationFrozenMethodVersion = 1;
             }
         }
@@ -86,9 +86,7 @@ public final class WindowManager {
     private Method getThawDisplayRotationMethod() throws NoSuchMethodException {
         if (thawDisplayRotationMethod == null) {
             try {
-                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
-                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
-                thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
+                thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
                 thawDisplayRotationMethodVersion = 0;
             } catch (NoSuchMethodException e) {
                 try {
@@ -97,7 +95,9 @@ public final class WindowManager {
                     thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
                     thawDisplayRotationMethodVersion = 1;
                 } catch (NoSuchMethodException e1) {
-                    thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
+                    // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
+                    // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
+                    thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
                     thawDisplayRotationMethodVersion = 2;
                 }
             }
@@ -120,18 +120,18 @@ public final class WindowManager {
             Method method = getFreezeDisplayRotationMethod();
             switch (freezeDisplayRotationMethodVersion) {
                 case 0:
-                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
-                    break;
-                case 1:
-                    method.invoke(manager, displayId, rotation);
-                    break;
-                default:
                     if (displayId != 0) {
                         Ln.e("Secondary display rotation not supported on this device");
                         return;
                     }
                     method.invoke(manager, rotation);
                     break;
+                case 1:
+                    method.invoke(manager, displayId, rotation);
+                    break;
+                default:
+                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
+                    break;
             }
         } catch (ReflectiveOperationException e) {
             Ln.e("Could not invoke method", e);
@@ -143,13 +143,13 @@ public final class WindowManager {
             Method method = getIsDisplayRotationFrozenMethod();
             switch (isDisplayRotationFrozenMethodVersion) {
                 case 0:
-                    return (boolean) method.invoke(manager, displayId);
-                default:
                     if (displayId != 0) {
                         Ln.e("Secondary display rotation not supported on this device");
                         return false;
                     }
                     return (boolean) method.invoke(manager);
+                default:
+                    return (boolean) method.invoke(manager, displayId);
             }
         } catch (ReflectiveOperationException e) {
             Ln.e("Could not invoke method", e);
@@ -162,18 +162,18 @@ public final class WindowManager {
             Method method = getThawDisplayRotationMethod();
             switch (thawDisplayRotationMethodVersion) {
                 case 0:
-                    method.invoke(manager, displayId, "scrcpy#thawRotation");
-                    break;
-                case 1:
-                    method.invoke(manager, displayId);
-                    break;
-                default:
                     if (displayId != 0) {
                         Ln.e("Secondary display rotation not supported on this device");
                         return;
                     }
                     method.invoke(manager);
                     break;
+                case 1:
+                    method.invoke(manager, displayId);
+                    break;
+                default:
+                    method.invoke(manager, displayId, "scrcpy#thawRotation");
+                    break;
             }
         } catch (ReflectiveOperationException e) {
             Ln.e("Could not invoke method", e);
@@ -189,10 +189,6 @@ public final class WindowManager {
                 cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, displayId);
             } catch (NoSuchMethodException e) {
                 // old version
-                if (displayId != 0) {
-                    Ln.e("Secondary display rotation not supported on this device");
-                    return;
-                }
                 cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);
             }
         } catch (Exception e) {