Update the methods used in scripts turnandroiddevscreenon and turnandroiddevscreenoff

adrianbartyczak · adrianbartyczak · commit 4694782480b0 · 2019-10-06T14:41:28.000-05:00
diff --git a/scripts/mobile_device_management-android/hardware_management/turnandroiddevscreenoff b/scripts/mobile_device_management-android/hardware_management/turnandroiddevscreenoff
@@ -7,7 +7,8 @@
 #   Turn an Android device screen off.
 # 
 
-readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' | grep mScreenOn)"
+readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' | grep \
+      'mHoldingDisplaySuspendBlocker=')"
 
 if [[ "${IS_SCREEN_ON##*=}" = *'true'* ]]; then
   adb -d shell 'input keyevent KEYCODE_POWER;'
diff --git a/scripts/mobile_device_management-android/hardware_management/turnandroiddevscreenon b/scripts/mobile_device_management-android/hardware_management/turnandroiddevscreenon
@@ -4,10 +4,11 @@
 #   turnandroiddevscreenon
 # 
 # Description:
-#   Turn an Android device screen on,
+#   Turn an Android device screen on.
 # 
 
-readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' | grep mScreenOn)"
+readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' | grep \
+      'mHoldingDisplaySuspendBlocker=')"
 
 if [[ "${IS_SCREEN_ON##*=}" = *'false'* ]]; then
   adb -d shell 'input keyevent KEYCODE_POWER;'

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`# Turn an Android device screen off.`
`8`	`8`	`#`
`9`	`9`
`10`		`-readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' \| grep mScreenOn)"`
	`10`	`+readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' \| grep \`
	`11`	`+ 'mHoldingDisplaySuspendBlocker=')"`
`11`	`12`
`12`	`13`	`if [[ "${IS_SCREEN_ON##=}" = 'true'* ]]; then`
`13`	`14`	`adb -d shell 'input keyevent KEYCODE_POWER;'`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@`
`4`	`4`	`# turnandroiddevscreenon`
`5`	`5`	`#`
`6`	`6`	`# Description:`
`7`		`-# Turn an Android device screen on,`
	`7`	`+# Turn an Android device screen on.`
`8`	`8`	`#`
`9`	`9`
`10`		`-readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' \| grep mScreenOn)"`
	`10`	`+readonly IS_SCREEN_ON="$(adb -d shell 'dumpsys power' \| grep \`
	`11`	`+ 'mHoldingDisplaySuspendBlocker=')"`
`11`	`12`
`12`	`13`	`if [[ "${IS_SCREEN_ON##=}" = 'false'* ]]; then`
`13`	`14`	`adb -d shell 'input keyevent KEYCODE_POWER;'`