Archives
/
scrcpy
mirror of https://github.com/Genymobile/scrcpy
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix freeze and thaw rotation for Android 14

Browse Source 
Changed since AOSP/framework_base commit
670fb7f5c0d23cf51ead25538bcb017e03ed73ac, included in tag
android-14.0.0_r29.

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

Signed-off-by: Romain Vimont <rom@rom1v.com>
pr4740.3
Stepan Salenikovich 3 months ago committed by Romain Vimont
parent ee6620d123
commit 7011dd1ef0
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File

40
server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
Unescape Escape View File

@ -52,10 +52,17 @@ public final class WindowManager {
freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class); freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
freezeDisplayRotationMethodVersion = 0; freezeDisplayRotationMethodVersion = 0;
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
// New method added by this commit: try {
// <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/> // New method added by this commit:
freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class); // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
freezeDisplayRotationMethodVersion = 1; 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; return freezeDisplayRotationMethod;
@ -82,10 +89,17 @@ public final class WindowManager {
thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation"); thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
thawDisplayRotationMethodVersion = 0; thawDisplayRotationMethodVersion = 0;
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
// New method added by this commit: try {
// <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/> // New method added by this commit:
thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class); // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
thawDisplayRotationMethodVersion = 1; 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; return thawDisplayRotationMethod;
@ -112,9 +126,12 @@ public final class WindowManager {
} }
method.invoke(manager, rotation); method.invoke(manager, rotation);
break; break;
default: case 1:
method.invoke(manager, displayId, rotation); method.invoke(manager, displayId, rotation);
break; break;
default:
method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
break;
} }
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
Ln.e("Could not invoke method", e); Ln.e("Could not invoke method", e);
@ -151,9 +168,12 @@ public final class WindowManager {
} }
method.invoke(manager); method.invoke(manager);
break; break;
default: case 1:
method.invoke(manager, displayId); method.invoke(manager, displayId);
break; break;
default:
method.invoke(manager, displayId, "scrcpy#thawRotation");
break;
} }
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
Ln.e("Could not invoke method", e); Ln.e("Could not invoke method", e);

Write Preview
Loading…
Cancel
Save