new regex to get ScreenResolution for Android 9 & 10 devices

Author: Paulina Strychacz

src/main/kotlin/internal/Constants.kt

@@ -6,6 +6,7 @@ import org.gradle.api.GradleException
 object ShellCommands {
     const val DUMPSYS_INPUT_METHOD = "dumpsys input_method"
     const val DUMPSYS_WINDOW = "dumpsys window"
+    const val DUMPSYS_WINDOW_DISPLAYS = "dumpsys window displays"
     const val DUMPSYS_WIFI = "dumpsys wifi"
     const val INPUT_WAKE_UP_CALL = "input keyevent 224"
     const val INPUT_SLEEP_CALL = "input keyevent 223"

src/main/kotlin/internal/DeviceWrapper.kt

@@ -8,6 +8,7 @@ import internal.ShellCommands.CHANGE_LANGUAGE_VIA_APP
 import internal.ShellCommands.DUMPSYS_INPUT_METHOD
 import internal.ShellCommands.DUMPSYS_WIFI
 import internal.ShellCommands.DUMPSYS_WINDOW
+import internal.ShellCommands.DUMPSYS_WINDOW_DISPLAYS
 import internal.ShellCommands.SETTINGS_GET_ANDROID_ID
 import internal.ShellCommands.SETTINGS_GET_GLOBAL
 import internal.ShellCommands.SETTINGS_GET_STAY_ON
@@ -32,7 +33,14 @@ class DeviceWrapper(val device: IDevice, val outputReceiverProvider: OutputRecei
     }
 
     fun getDeviceScreenResolution(): ScreenResolution {
-        val output = analyzeOutputOfShellCommandByRegex(DUMPSYS_WINDOW, "mUnrestrictedScreen.*?(\\d+)x(\\d+)")
+        val output: Matcher = try {
+            analyzeOutputOfShellCommandByRegex(DUMPSYS_WINDOW, "mUnrestrictedScreen.*?(\\d+)x(\\d+)")
+        }
+        catch (e: GradleException) {
+            // Android 9 & 10
+            analyzeOutputOfShellCommandByRegex(DUMPSYS_WINDOW_DISPLAYS, "mUnrestricted.*?\\[.*\\]\\[(\\d+),(\\d+)\\]")
+        }
+
         val screenWidth = output.group(1).trim().toInt()
         val screenHeight = output.group(2).trim().toInt()
         return ScreenResolution(xValue = screenWidth, yValue = screenHeight)