Skip to content

Display and control your Android device

Adapt event injection to Android 13

Romain Vimont7d8b72d4a644
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
index 61168993..c42f9de1 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy.wrappers;
import com.genymobile.scrcpy.Ln;
-import android.os.IInterface;
import android.view.InputEvent;
import java.lang.reflect.InvocationTargetException;
@@ -14,13 +13,13 @@ public final class InputManager {
public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_RESULT = 1;
public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = 2;
- private final IInterface manager;
+ private final android.hardware.input.InputManager manager;
private Method injectInputEventMethod;
private boolean alternativeInjectInputEventMethod;
private static Method setDisplayIdMethod;
- public InputManager(IInterface manager) {
+ public InputManager(android.hardware.input.InputManager manager) {
this.manager = manager;
}
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
index 6f4b9c04..ea2a0784 100644
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
import android.os.IBinder;
import android.os.IInterface;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@SuppressLint("PrivateApi,DiscouragedPrivateApi")
@@ -56,7 +57,13 @@ public final class ServiceManager {
public InputManager getInputManager() {
if (inputManager == null) {
- inputManager = new InputManager(getService("input", "android.hardware.input.IInputManager"));
+ try {
+ Method getInstanceMethod = android.hardware.input.InputManager.class.getDeclaredMethod("getInstance");
+ android.hardware.input.InputManager im = (android.hardware.input.InputManager) getInstanceMethod.invoke(null);
+ inputManager = new InputManager(im);
+ } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+ throw new AssertionError(e);
+ }
}
return inputManager;
}