Fix DisplayControl classpath

Use the full system server classpath to load DisplayControl, so that turning the screen off on Android 14+ does not crash on certain devices. Refs Genymobile#4544 comment <Genymobile#4544 (comment)> Fixes Genymobile#4544 <Genymobile#4544> Fixes Genymobile#5274 <Genymobile#5274> Signed-off-by: Romain Vimont <[email protected]>
rom1v · Dec 9, 2024 · a507b4f · a507b4f
1 parent a9aadc9
commit a507b4f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
@@ -6,6 +6,7 @@
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.os.IBinder;
+import android.system.Os;
 
 import java.lang.reflect.Method;
 
@@ -21,7 +22,9 @@ public final class DisplayControl {
             Class<?> classLoaderFactoryClass = Class.forName("com.android.internal.os.ClassLoaderFactory");
             Method createClassLoaderMethod = classLoaderFactoryClass.getDeclaredMethod("createClassLoader", String.class, String.class, String.class,
                     ClassLoader.class, int.class, boolean.class, String.class);
-            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, "/system/framework/services.jar", null, null,
+
+            String systemServerClasspath = Os.getenv("SYSTEMSERVERCLASSPATH");
+            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, systemServerClasspath, null, null,
                     ClassLoader.getSystemClassLoader(), 0, true, null);
 
             displayControlClass = classLoader.loadClass("com.android.server.display.DisplayControl");