isscreenon interface compatible with android 10

(cherry picked from commit 91d263e844698a6328a5f2421112d5140e9c0c45) (cherry picked from commit b5ec905)
AirtestProject · Jun 28, 2020 · ba721f0 · ba721f0
1 parent c6b0823
commit ba721f0
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/airtest/core/android/adb.py b/airtest/core/android/adb.py
@@ -1059,18 +1059,17 @@ def is_screenon(self):
             True or False whether the screen is turned on or off
 
         """
-        try:
-            screenOnRE = re.compile('mScreenOnFully=(true|false)')
-            m = screenOnRE.search(self.shell('dumpsys window policy'))
-            if m:
-                return (m.group(1) == 'true')
-            raise AirtestError("Couldn't determine screen ON state")
-        except Exception:
+        screenOnRE = re.compile('mScreenOnFully=(true|false)')
+        m = screenOnRE.search(self.shell('dumpsys window policy'))
+        if m:
+            return m.group(1) == 'true'
+        else:
+            # MIUI11
             screenOnRE = re.compile('screenState=(SCREEN_STATE_ON|SCREEN_STATE_OFF)')
             m = screenOnRE.search(self.shell('dumpsys window policy'))
             if m:
-                return (m.group(1) == 'SCREEN_STATE_ON')
-            raise AirtestError("Couldn't determine screen ON state")
+                return m.group(1) == 'SCREEN_STATE_ON'
+        raise AirtestError("Couldn't determine screen ON state")
 
     def is_locked(self):
         """