Display and control your Android device
Do not fail when uniqueId field is missing
Romain Vimontd0047b2110e2
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.javaindex a12470a4..9e84ec00 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java@@ -139,7 +139,13 @@ public final class DisplayManager {int layerStack = cls.getDeclaredField("layerStack").getInt(displayInfo);int flags = cls.getDeclaredField("flags").getInt(displayInfo);int dpi = cls.getDeclaredField("logicalDensityDpi").getInt(displayInfo);- String uniqueId = (String) cls.getDeclaredField("uniqueId").get(displayInfo);+ String uniqueId;+ try {+ uniqueId = (String) cls.getDeclaredField("uniqueId").get(displayInfo);+ } catch (NoSuchFieldException e) {+ // This field might not exist: <https://github.com/Genymobile/scrcpy/issues/6461>+ uniqueId = null;+ }return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags, dpi, uniqueId);} catch (ReflectiveOperationException e) {throw new AssertionError(e);