From b09496d3be521bcfdb066b2e49a176bad876e25d Mon Sep 17 00:00:00 2001
From: Erik Porsche <e.porsche@web.de>
Date: Sun, 17 Nov 2024 14:34:17 +0100
Subject: [PATCH 1/3] Fix Sony TV Android 10 broken currently running app

---
 androidtv/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidtv/constants.py b/androidtv/constants.py
index 6fa36bb..67ec3c1 100644
--- a/androidtv/constants.py
+++ b/androidtv/constants.py
@@ -90,7 +90,7 @@ class DeviceEnum(IntEnum):
 CMD_PARSE_CURRENT_APP11 = "CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP##* }"
 #: Assign focused application identifier to ``CURRENT_APP`` variable
 CMD_DEFINE_CURRENT_APP_VARIABLE = (
-    "CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && " + CMD_PARSE_CURRENT_APP
+    "CURRENT_APP=$(dumpsys window windows | grep -E 'Window #1|mCurrentFocus|mFocusedApp') && " + CMD_PARSE_CURRENT_APP
 )
 #: Assign focused application identifier to ``CURRENT_APP`` variable for an Android 11 device
 CMD_DEFINE_CURRENT_APP_VARIABLE11 = (

From 27de36d99a5bb49102ac0f001406049d3e8cb5dd Mon Sep 17 00:00:00 2001
From: Erik Porsche <e.porsche@web.de>
Date: Sun, 17 Nov 2024 14:42:38 +0100
Subject: [PATCH 2/3] added tests

---
 tests/test_constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_constants.py b/tests/test_constants.py
index d2f9ca5..1c193b0 100644
--- a/tests/test_constants.py
+++ b/tests/test_constants.py
@@ -80,7 +80,7 @@ def test_constants(self):
         # CMD_CURRENT_APP
         self.assertCommand(
             constants.CMD_CURRENT_APP,
-            r"CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP",
+            r"CURRENT_APP=$(dumpsys window windows | grep -E 'Window #1|mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP",
         )
 
         # CMD_CURRENT_APP11

From c63c7e118ff33d5f25cd3a2ae7b54bdd456416b8 Mon Sep 17 00:00:00 2001
From: Erik Porsche <e.porsche@web.de>
Date: Mon, 18 Nov 2024 08:26:02 +0100
Subject: [PATCH 3/3] fix tests

---
 tests/test_constants.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_constants.py b/tests/test_constants.py
index 1c193b0..522e529 100644
--- a/tests/test_constants.py
+++ b/tests/test_constants.py
@@ -115,7 +115,7 @@ def test_constants(self):
         # CMD_CURRENT_APP_MEDIA_SESSION_STATE
         self.assertCommand(
             constants.CMD_CURRENT_APP_MEDIA_SESSION_STATE,
-            r"CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {'",
+            r"CURRENT_APP=$(dumpsys window windows | grep -E 'Window #1|mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {'",
         )
 
         # CMD_CURRENT_APP_MEDIA_SESSION_STATE11
@@ -171,7 +171,7 @@ def test_constants(self):
         # CMD_LAUNCH_APP
         self.assertCommand(
             constants.CMD_LAUNCH_APP,
-            r"CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${{CURRENT_APP#*ActivityRecord{{* * }} && CURRENT_APP=${{CURRENT_APP#*{{* * }} && CURRENT_APP=${{CURRENT_APP%%/*}} && CURRENT_APP=${{CURRENT_APP%\}}*}} && if [ $CURRENT_APP != '{0}' ]; then monkey -p {0} -c android.intent.category.LEANBACK_LAUNCHER --pct-syskeys 0 1; fi",
+            r"CURRENT_APP=$(dumpsys window windows | grep -E 'Window #1|mCurrentFocus|mFocusedApp') && CURRENT_APP=${{CURRENT_APP#*ActivityRecord{{* * }} && CURRENT_APP=${{CURRENT_APP#*{{* * }} && CURRENT_APP=${{CURRENT_APP%%/*}} && CURRENT_APP=${{CURRENT_APP%\}}*}} && if [ $CURRENT_APP != '{0}' ]; then monkey -p {0} -c android.intent.category.LEANBACK_LAUNCHER --pct-syskeys 0 1; fi",
         )
 
         # CMD_LAUNCH_APP11
@@ -195,7 +195,7 @@ def test_constants(self):
         # CMD_LAUNCH_APP_FIRETV
         self.assertCommand(
             constants.CMD_LAUNCH_APP_FIRETV,
-            r"CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${{CURRENT_APP#*ActivityRecord{{* * }} && CURRENT_APP=${{CURRENT_APP#*{{* * }} && CURRENT_APP=${{CURRENT_APP%%/*}} && CURRENT_APP=${{CURRENT_APP%\}}*}} && if [ $CURRENT_APP != '{0}' ]; then monkey -p {0} -c android.intent.category.LAUNCHER --pct-syskeys 0 1; fi",
+            r"CURRENT_APP=$(dumpsys window windows | grep -E 'Window #1|mCurrentFocus|mFocusedApp') && CURRENT_APP=${{CURRENT_APP#*ActivityRecord{{* * }} && CURRENT_APP=${{CURRENT_APP#*{{* * }} && CURRENT_APP=${{CURRENT_APP%%/*}} && CURRENT_APP=${{CURRENT_APP%\}}*}} && if [ $CURRENT_APP != '{0}' ]; then monkey -p {0} -c android.intent.category.LAUNCHER --pct-syskeys 0 1; fi",
         )
 
         # CMD_LAUNCH_APP_GOOGLE_TV