fix freeze and thaw rotation for Android 15 preview #4740

ssalenik · 2024-03-07T19:27:44Z

On a device with Android 15 developer preview (and I think this also impacts the 14 QPR3 Beta) we get an error when trying to rotate the device:

scrcpy 2.3.1 <https://github.com/Genymobile/scrcpy>
INFO: ADB device found:
INFO:     --> (tcpip)  26101FDF6003UC           device  Pixel_6
x/server/scrcpy-server: 1 file pushed, 0 skipped. 3.1 MB/s (66691 bytes in 0.020s)
[server] INFO: Device: [Google] google Pixel 6 (Android 14)
INFO: Renderer: metal
INFO: Texture: 360x800
[server] INFO: Device rotation requested: landscape
[server] ERROR: Could not invoke method
java.lang.NoSuchMethodException: android.view.IWindowManager$Stub$Proxy.freezeRotation [int]
        at java.lang.Class.getMethod(Class.java:2950)
        at java.lang.Class.getMethod(Class.java:2450)
        at com.genymobile.scrcpy.wrappers.WindowManager.getFreezeRotationMethod(WindowManager.java:48)
        at com.genymobile.scrcpy.wrappers.WindowManager.freezeRotation(WindowManager.java:111)
        at com.genymobile.scrcpy.Device.rotateDevice(Device.java:372)
        at com.genymobile.scrcpy.Controller.handleEvent(Controller.java:183)
        at com.genymobile.scrcpy.Controller.control(Controller.java:85)
        at com.genymobile.scrcpy.Controller.lambda$start$0$com-genymobile-scrcpy-Controller(Controller.java:93)
        at com.genymobile.scrcpy.Controller$$ExternalSyntheticLambda1.run(Unknown Source:4)
        at java.lang.Thread.run(Thread.java:1012)

The source code is not out yet, but using reflection we can see that the freeze and thaw rotation methods all have a new signature with a String parameter added:

public void android.view.IWindowManager$Stub$Proxy.thawRotation(java.lang.String) throws android.os.RemoteException
public void android.view.IWindowManager$Stub$Proxy.thawDisplayRotation(int,java.lang.String) throws android.os.RemoteException
public void android.view.IWindowManager$Stub$Proxy.freezeRotation(int,java.lang.String) throws android.os.RemoteException
public void android.view.IWindowManager$Stub$Proxy.freezeDisplayRotation(int,int,java.lang.String) throws android.os.RemoteException

I tried passing an empty String and it works.

This PR adds these new method signatures to try first.

rom1v · 2024-03-07T21:34:24Z

Thank you.

Could you please post your framework.jar please?

adb pull /system/framework/framework.jar

ssalenik · 2024-03-07T21:39:09Z

framework.jar.tar.gz

rom1v · 2024-03-07T22:17:59Z

jadx.plugins.input.dex.DexException: Bad checksum: 0x6dca9986, expected: 0x962f5582

🤔

ssalenik · 2024-03-07T22:20:27Z

I got the same thing. You can ignore the checksum with jadx -Pdex-input.verify-checksum=no but I didn't find these methods nor the WindowManager class in the decompiled code after, though it had a few errors in decompilation.

ssalenik · 2024-03-08T16:32:13Z

Looks like they published the source for this change in master now:
https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/view/IWindowManager.aidl#345
The parameter is String caller, though they don't describe the parameter:

https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/view/IWindowManager.aidl#345

anotheruserofgithub · 2024-03-08T16:48:03Z

It's for debugging: https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/

ssalenik · 2024-03-08T17:00:37Z

Ah, thanks. Makes sense. I guess we can add "scrcpy" or "scrcpy#setRotation" and "scrcpy#restoreRotationStateLocked" to follow their lead.

Select the available method to invoke the same way as in other wrappers (using a version field). Refs d894e27 Refs #4740 <#4740>

Refs <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/> PR #4740 <#4740> Signed-off-by: Romain Vimont <rom@rom1v.com>

rom1v · 2024-04-01T13:34:57Z

Thank you 👍

I added a preliminary commit to refactor the current codebase: 4623927.
Then I rebased your PR on this commit (using the new version field): 803a7e0

I pushed to branch pr4740. Please review and test 😉

ssalenik · 2024-04-04T01:19:24Z

@rom1v tested pr4740 and works on Android 15 preview

rom1v · 2024-04-06T15:37:58Z

Btw, it seems the change has landed in Android 14 (stable, not preview), on a Pixel 8 without this PR I get the error on rotation with MOD+r.

$ git tag --contains 670fb7f5c0d23cf51ead25538bcb017e03ed73ac
android-14.0.0_r29
android-14.0.0_r30
android-14.0.0_r31

Select the available method to invoke the same way as in other wrappers (using a version field). Refs d894e27 Refs #4740 <#4740>

Changed since AOSP/framework_base commit 670fb7f5c0d23cf51ead25538bcb017e03ed73ac, included in tag android-14.0.0_r29. Refs <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/> PR #4740 <#4740> Signed-off-by: Romain Vimont <rom@rom1v.com>

rom1v · 2024-04-07T09:24:38Z

Merged into dev: 7011dd1

eiyooooo · 2024-04-12T05:53:42Z

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

Lines 49 to 106 in 7011dd1

    
           private Method getFreezeDisplayRotationMethod() throws NoSuchMethodException { 
        
               if (freezeDisplayRotationMethod == null) { 
        
                   try { 
        
                       freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class); 
        
                       freezeDisplayRotationMethodVersion = 0; 
        
                   } catch (NoSuchMethodException e) { 
        
                       try { 
        
                           // New method added by this commit: 
        
                           // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/> 
        
                           freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class); 
        
                           freezeDisplayRotationMethodVersion = 1; 
        
                       } catch (NoSuchMethodException e1) { 
        
                           // 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; 
        
                       } 
        
                   } 
        
               } 
        
               return freezeDisplayRotationMethod; 
        
           } 
        
           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 = 1; 
        
                   } 
        
               } 
        
               return isDisplayRotationFrozenMethod; 
        
           } 
        
           private Method getThawDisplayRotationMethod() throws NoSuchMethodException { 
        
               if (thawDisplayRotationMethod == null) { 
        
                   try { 
        
                       thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation"); 
        
                       thawDisplayRotationMethodVersion = 0; 
        
                   } catch (NoSuchMethodException e) { 
        
                       try { 
        
                           // New method added by this commit: 
        
                           // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/> 
        
                           thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class); 
        
                           thawDisplayRotationMethodVersion = 1; 
        
                       } catch (NoSuchMethodException e1) { 
        
                           // 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; 
        
                       } 
        
                   } 
        
               } 
        
               return thawDisplayRotationMethod; 
        
           }

Should try the newest method first, then old method.

Because the old method still exists while the new method is introduced.

Seeing #4841

rom1v · 2024-04-12T07:11:56Z

Because the old method still exists while the new method is introduced.

Nope, it was replaced: https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/

eiyooooo · 2024-04-12T08:12:47Z

Nope, it was replaced: https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/

While freezeDisplayRotation is introduced, freezeRotation still exists.

If try freezeRotation first, then could not rotate secondary display.

C:\q\software\scrcpy-win64-v2.4>scrcpy.exe --display-id 67
scrcpy 2.4 <https://github.com/Genymobile/scrcpy>
INFO: ADB device found:
INFO:     -->   (usb)  R5CN2100000                     device  SM_G986U1
C:\q\software\scrcpy-win64-v2.4\scrcpy-server: 1 file pushed, 0 skipped. 29.5 MB/s (69259 bytes in 0.002s)
[server] INFO: Device: [samsung] samsung SM-G986U1 (Android 13)
[server] WARN: Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted
INFO: Renderer: direct3d
INFO: Texture: 1080x1920
[server] ERROR: Secondary display rotation not supported on this device
[server] INFO: Device rotation requested: landscape
[server] ERROR: Secondary display rotation not supported on this device
[server] ERROR: Secondary display rotation not supported on this device

So try freezeDisplayRotation first, if freezeDisplayRotation not exists then freezeRotation.

C:\q\software\scrcpy-win64-v2.4>scrcpy.exe --display-id 67
scrcpy 2.4 <https://github.com/Genymobile/scrcpy>
INFO: ADB device found:
INFO:     -->   (usb)  R5CN2100000                     device  SM_G986U1
C:\q\software\scrcpy-win64-v2.4\scrcpy-server: 1 file pushed, 0 skipped. 84.4 MB/s (69223 bytes in 0.001s)
[server] INFO: Device: [samsung] samsung SM-G986U1 (Android 13)
[server] WARN: Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted
INFO: Renderer: direct3d
INFO: Texture: 1080x1920
[server] INFO: Device rotation requested: landscape
INFO: Texture: 1920x1080
[server] INFO: Device rotation requested: portrait
INFO: Texture: 1080x1920
WARN: Killing the server...

BTW, watchRotation old version should check if displayId is 0.

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

Lines 183 to 197 in 7011dd1

    
           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, displayId); 
        
                   } catch (NoSuchMethodException e) { 
        
                       // old version 
        
                       cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher); 
        
                   } 
        
               } catch (Exception e) { 
        
                   Ln.e("Could not register rotation watcher", e); 
        
               } 
        
           }

rom1v · 2024-04-12T09:21:58Z

Oh ok, sorry, I've read the whole thing from my phone, I will check later from my computer.

ssalenik · 2024-04-12T13:49:49Z

Oh, oups. I didn't notice that your refactor @rom1v changed this. Before we were trying the methods which allow to specify the display first and then falling back to the old one in the case that display == 0.

The version of the methods with the display id parameter must be tried first, otherwise they will never be used (since the old versions without the display id are still present). Regression introduced by ee6620d. Refs #4740 <#4740> PR #4841 <#4841> Signed-off-by: Romain Vimont <rom@rom1v.com>

Old Android versions may not be able to register a rotation watcher for a secondary display. In that case, report the error instead of registering a rotation watcher for the default display. Refs <#4740 (comment)> Suggested by: Kaiming Hu <huxxx1234@gmail.com>

rom1v · 2024-04-12T15:29:17Z

LGTM, see #4841.

fix freeze and thaw rotation for Android 15 preview

1e26e48

update comment with commit and specify caller

e669535

rom1v added a commit that referenced this pull request Apr 1, 2024

Refactor WindowManager methods

4623927

Select the available method to invoke the same way as in other wrappers (using a version field). Refs d894e27 Refs #4740 <#4740>

rom1v added a commit that referenced this pull request Apr 6, 2024

Refactor WindowManager methods

ee6620d

Select the available method to invoke the same way as in other wrappers (using a version field). Refs d894e27 Refs #4740 <#4740>

rom1v closed this Apr 7, 2024

rom1v mentioned this pull request Apr 11, 2024

Unable to rotate screen via mod+r #4839

Closed

rom1v mentioned this pull request Apr 12, 2024

Fix could not rotate secondary display #4841

Closed

rom1v mentioned this pull request Jun 20, 2024

Error on MOD + R (rotation shortcut): Could not invoke method (NoSuchMethodException) #5006

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix freeze and thaw rotation for Android 15 preview #4740

fix freeze and thaw rotation for Android 15 preview #4740

ssalenik commented Mar 7, 2024 •

edited

Loading

rom1v commented Mar 7, 2024

ssalenik commented Mar 7, 2024

rom1v commented Mar 7, 2024

ssalenik commented Mar 7, 2024

ssalenik commented Mar 8, 2024

anotheruserofgithub commented Mar 8, 2024

ssalenik commented Mar 8, 2024

rom1v commented Apr 1, 2024

ssalenik commented Apr 4, 2024

rom1v commented Apr 6, 2024

rom1v commented Apr 7, 2024

eiyooooo commented Apr 12, 2024 •

edited

Loading

rom1v commented Apr 12, 2024

eiyooooo commented Apr 12, 2024 •

edited

Loading

rom1v commented Apr 12, 2024 •

edited

Loading

ssalenik commented Apr 12, 2024

rom1v commented Apr 12, 2024

fix freeze and thaw rotation for Android 15 preview #4740

fix freeze and thaw rotation for Android 15 preview #4740

Conversation

ssalenik commented Mar 7, 2024 • edited Loading

rom1v commented Mar 7, 2024

ssalenik commented Mar 7, 2024

rom1v commented Mar 7, 2024

ssalenik commented Mar 7, 2024

ssalenik commented Mar 8, 2024

anotheruserofgithub commented Mar 8, 2024

ssalenik commented Mar 8, 2024

rom1v commented Apr 1, 2024

ssalenik commented Apr 4, 2024

rom1v commented Apr 6, 2024

rom1v commented Apr 7, 2024

eiyooooo commented Apr 12, 2024 • edited Loading

rom1v commented Apr 12, 2024

eiyooooo commented Apr 12, 2024 • edited Loading

rom1v commented Apr 12, 2024 • edited Loading

ssalenik commented Apr 12, 2024

rom1v commented Apr 12, 2024

ssalenik commented Mar 7, 2024 •

edited

Loading

eiyooooo commented Apr 12, 2024 •

edited

Loading

eiyooooo commented Apr 12, 2024 •

edited

Loading

rom1v commented Apr 12, 2024 •

edited

Loading