diff --git a/androidtv/constants.py b/androidtv/constants.py index 6fa36bb3..d43af1b1 100644 --- a/androidtv/constants.py +++ b/androidtv/constants.py @@ -226,7 +226,7 @@ class DeviceEnum(IntEnum): CMD_INSTALLED_APPS = "pm list packages" #: Determine if the device is on -CMD_SCREEN_ON = "(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON')" +CMD_SCREEN_ON = "(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null" #: Get the "STREAM_MUSIC" block from ``dumpsys audio`` CMD_STREAM_MUSIC = r"dumpsys audio | grep '\- STREAM_MUSIC:' -A 11" diff --git a/tests/test_constants.py b/tests/test_constants.py index d2f9ca5f..ce682340 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -231,13 +231,13 @@ def test_constants(self): # CMD_SCREEN_ON self.assertCommand( constants.CMD_SCREEN_ON, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON')", + r"(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null", ) # CMD_SCREEN_ON_AWAKE_WAKE_LOCK_SIZE self.assertCommand( constants.CMD_SCREEN_ON_AWAKE_WAKE_LOCK_SIZE, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep Locks | grep 'size='", + r"(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep Locks | grep 'size='", ) # CMD_SERIALNO @@ -249,25 +249,25 @@ def test_constants(self): # CMD_TURN_OFF_ANDROIDTV self.assertCommand( constants.CMD_TURN_OFF_ANDROIDTV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') && input keyevent 26", + r"(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null && input keyevent 26", ) # CMD_TURN_OFF_FIRETV self.assertCommand( constants.CMD_TURN_OFF_FIRETV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') && input keyevent 223", + r"(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null && input keyevent 223", ) # CMD_TURN_ON_ANDROIDTV self.assertCommand( constants.CMD_TURN_ON_ANDROIDTV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') || input keyevent 26", + r"(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null || input keyevent 26", ) # CMD_TURN_ON_FIRETV self.assertCommand( constants.CMD_TURN_ON_FIRETV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') || (input keyevent 26 && input keyevent 3)", + r"(dumpsys deviceidle get screen | grep true || dumpsys power | grep 'Display Power' | grep 'state=ON' || dumpsys power | grep 'mScreenOn=true' || dumpsys display | grep 'mScreenState=ON') > /dev/null || (input keyevent 26 && input keyevent 3)", ) # CMD_VERSION