Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When dismissing lockscreen, wait up to 1.5 seconds for it to work." into tm-dev

Browse Source
This commit is contained in:
Dave McCloskey
2022-03-03 18:11:07 +00:00
committed by Android (Google) Code Review
parent f358e1a101 b719c6bcf4
commit 1442d3449b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/TrustTests/src/android/trust/test/lib/ScreenLockRule.kt
View File

@@ -59,8 +59,14 @@ class ScreenLockRule : TestRule {
} }
private fun verifyKeyguardDismissed() { private fun verifyKeyguardDismissed() {
windowManager.dismissKeyguard(null, null) val maxWaits = 30
Thread.sleep(250) var waitCount = 0
while (windowManager.isKeyguardLocked && waitCount < maxWaits) {
Log.i(TAG, "Keyguard still showing; attempting to dismiss and wait 50ms ($waitCount)")
windowManager.dismissKeyguard(null, null)
Thread.sleep(50)
waitCount++
}
assertWithMessage("Keyguard should be unlocked") assertWithMessage("Keyguard should be unlocked")
.that(windowManager.isKeyguardLocked) .that(windowManager.isKeyguardLocked)
.isFalse() .isFalse()