From: GiviMAD <GiviMAD@users.noreply.github.com>
Date: Fri, 24 Mar 2023 22:25:21 +0000 (+0100)
Subject: [androiddebugbridge] Fix screen state channel on android 12 (#14663)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=b9751dced3a16b3501a1fb5d6627cea0fc06f870;p=openhab-addons.git

[androiddebugbridge] Fix screen state channel on android 12 (#14663)

Signed-off-by: Miguel Álvarez <miguelwork92@gmail.com>
---

diff --git a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java
index 8b30b9df50..a35897f9a0 100644
--- a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java
+++ b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java
@@ -244,6 +244,10 @@ public class AndroidDebugBridgeDevice {
 
     public boolean isScreenOn() throws InterruptedException, AndroidDebugBridgeDeviceException,
             AndroidDebugBridgeDeviceReadException, TimeoutException, ExecutionException {
+        if (isAtLeastVersion(12)) {
+            String devicesResp = runAdbShell("getprop", "debug.tracing.screen_state");
+            return devicesResp.replace("\n", "").equals("2");
+        }
         String devicesResp = runAdbShell("dumpsys", "power", "|", "grep", "'Display Power'");
         if (devicesResp.contains("=")) {
             try {