Use DisplayManagerGlobal instance

Use the client instance to communicate with the DisplayManager server.

Fixes #3446 <https://github.com/Genymobile/scrcpy/issues/3446>

Signed-off-by: Romain Vimont <rom@rom1v.com>
This commit is contained in:
Derek Wu 2022-08-16 23:52:08 +02:00 committed by Romain Vimont
parent d19606eb0c
commit 9c1722f428
2 changed files with 10 additions and 5 deletions

View file

@ -3,12 +3,10 @@ package com.genymobile.scrcpy.wrappers;
import com.genymobile.scrcpy.DisplayInfo; import com.genymobile.scrcpy.DisplayInfo;
import com.genymobile.scrcpy.Size; import com.genymobile.scrcpy.Size;
import android.os.IInterface;
public final class DisplayManager { public final class DisplayManager {
private final IInterface manager; private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal
public DisplayManager(IInterface manager) { public DisplayManager(Object manager) {
this.manager = manager; this.manager = manager;
} }

View file

@ -50,7 +50,14 @@ public final class ServiceManager {
public DisplayManager getDisplayManager() { public DisplayManager getDisplayManager() {
if (displayManager == null) { if (displayManager == null) {
displayManager = new DisplayManager(getService("display", "android.hardware.display.IDisplayManager")); try {
Class<?> clazz = Class.forName("android.hardware.display.DisplayManagerGlobal");
Method getInstanceMethod = clazz.getDeclaredMethod("getInstance");
Object dmg = getInstanceMethod.invoke(null);
displayManager = new DisplayManager(dmg);
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new AssertionError(e);
}
} }
return displayManager; return displayManager;
} }