From f1804300d47cf77e92e6b82d837886684208fe58 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Mon, 15 May 2017 10:40:50 +0100 Subject: [PATCH] idle: makes sure screen is off if was off before In the case where the device screen was off prior to the execution of the workload, but the user did not set screen_off, the screen will be turned on during the setup. Previously, it would remain on for the subsequent execution, however the correct behavior is for the workload to always restore the screen to its previous state. --- wa/workloads/idle.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wa/workloads/idle.py b/wa/workloads/idle.py index 88c3bdab..8d49c89e 100644 --- a/wa/workloads/idle.py +++ b/wa/workloads/idle.py @@ -63,8 +63,7 @@ class IdleWorkload(Workload): def setup(self, context): if self.target.os == 'android': - if self.screen_off: - self.old_screen_state = self.target.is_screen_on() + self.old_screen_state = self.target.is_screen_on() self.target.ensure_screen_is_on() self.target.homescreen() if self.screen_off: @@ -89,3 +88,5 @@ class IdleWorkload(Workload): self.target.sleep(1) if self.screen_off and self.old_screen_state: self.target.ensure_screen_is_on() + elif not self.screen_off and not self.old_screen_state: + self.target.ensure_screen_is_off()