Archives/scrcpy
2
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy synced 2024-11-15 06:12:53 +00:00
Code Issues Projects Releases Wiki Activity

fix freeze and thaw rotation for Android 15 preview

Browse Source
This commit is contained in:
Stepan Salenikovich 2024-03-07 14:13:22 -05:00
parent 7f23ff3f2c
commit 1e26e48e1f
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
View File

@ -59,6 +59,16 @@ public final class WindowManager {
return freezeDisplayRotationMethod; return freezeDisplayRotationMethod;
} }
// Android 15 preview and 14 QPR3 Beta introduces a new signature for freeze and thaw rotation
// methods which includes a String parameters:
// public void android.view.IWindowManager$Stub$Proxy.freezeDisplayRotation(int,int,java.lang.String) throws android.os.RemoteException
private Method getFreezeDisplayRotationStringMethod() throws NoSuchMethodException {
if (freezeDisplayRotationMethod == null) {
freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
}
return freezeDisplayRotationMethod;
}
private Method getIsRotationFrozenMethod() throws NoSuchMethodException { private Method getIsRotationFrozenMethod() throws NoSuchMethodException {
if (isRotationFrozenMethod == null) { if (isRotationFrozenMethod == null) {
isRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen"); isRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
@ -91,6 +101,16 @@ public final class WindowManager {
return thawDisplayRotationMethod; return thawDisplayRotationMethod;
} }
// Android 15 preview and 14 QPR3 Beta introduces a new signature for freeze and thaw rotation
// methods which includes a String parameters:
// public void android.view.IWindowManager$Stub$Proxy.thawDisplayRotation(int,java.lang.String) throws android.os.RemoteException
private Method getThawDisplayRotationStringMethod() throws NoSuchMethodException {
if (thawDisplayRotationMethod == null) {
thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
}
return thawDisplayRotationMethod;
}
public int getRotation() { public int getRotation() {
try { try {
Method method = getGetRotationMethod(); Method method = getGetRotationMethod();
@ -104,8 +124,14 @@ public final class WindowManager {
public void freezeRotation(int displayId, int rotation) { public void freezeRotation(int displayId, int rotation) {
try { try {
try { try {
try {
Method method = getFreezeDisplayRotationStringMethod();
// TODO: specify the String param once we know what it is for
method.invoke(manager, displayId, rotation, "");
} catch (ReflectiveOperationException e) {
Method method = getFreezeDisplayRotationMethod(); Method method = getFreezeDisplayRotationMethod();
method.invoke(manager, displayId, rotation); method.invoke(manager, displayId, rotation);
}
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
if (displayId == 0) { if (displayId == 0) {
Method method = getFreezeRotationMethod(); Method method = getFreezeRotationMethod();
@ -142,8 +168,14 @@ public final class WindowManager {
public void thawRotation(int displayId) { public void thawRotation(int displayId) {
try { try {
try { try {
try {
Method method = getThawDisplayRotationStringMethod();
// TODO: specify the String param once we know what it is for
method.invoke(manager, displayId, "");
} catch (ReflectiveOperationException e) {
Method method = getThawDisplayRotationMethod(); Method method = getThawDisplayRotationMethod();
method.invoke(manager, displayId); method.invoke(manager, displayId);
}
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
if (displayId == 0) { if (displayId == 0) {
Method method = getThawRotationMethod(); Method method = getThawRotationMethod();