Fix "turn screen off" on Android Q

Call getInternalDisplayToken(), which retrieve the id of the first physical display (which is not necessarily 0 anymore). Fixes <#835>
Genymobile · Oct 17, 2019 · c33a147 · c33a147
1 parent 8b33c6c
commit c33a147
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -161,7 +161,7 @@ public void setClipboardText(String text) {
      * @param mode one of the {@code SCREEN_POWER_MODE_*} constants
      */
     public void setScreenPowerMode(int mode) {
-        IBinder d = SurfaceControl.getBuiltInDisplay(0);
+        IBinder d = SurfaceControl.getBuiltInDisplay();
         if (d == null) {
             Ln.e("Could not get built-in display");
             return;

diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
@@ -92,7 +92,7 @@ private static Method getGetBuiltInDisplayMethod() {
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                     getBuiltInDisplayMethod = CLASS.getMethod("getBuiltInDisplay", int.class);
                 } else {
-                    getBuiltInDisplayMethod = CLASS.getMethod("getPhysicalDisplayToken", long.class);
+                    getBuiltInDisplayMethod = CLASS.getMethod("getInternalDisplayToken");
                 }
             } catch (NoSuchMethodException e) {
                 Ln.e("Could not find method", e);
@@ -101,13 +101,19 @@ private static Method getGetBuiltInDisplayMethod() {
         return getBuiltInDisplayMethod;
     }
 
-    public static IBinder getBuiltInDisplay(int builtInDisplayId) {
+    public static IBinder getBuiltInDisplay() {
         Method method = getGetBuiltInDisplayMethod();
         if (method == null) {
             return null;
         }
         try {
-            return (IBinder) method.invoke(null, builtInDisplayId);
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                // call getBuiltInDisplay(0)
+                return (IBinder) method.invoke(null, 0);
+            }
+
+            // call getInternalDisplayToken()
+            return (IBinder) method.invoke(null);
         } catch (InvocationTargetException | IllegalAccessException e) {
             Ln.e("Could not invoke " + method.getName(), e);
             return null;