Reset isFoldHandled

isFoldHandled was never getting reset to true. This caused a potential
race condition when:

1. AOD enabled
2. Unfold the device
3. Fold the device.
4. Cover prox sensor to turn display off, such as a person would when
putting the phone in purse or pocket
5. Take phone out and immediately unlock with SideFPS

This was causing onScreenOn to run, and FoldAodAnimationController to
rerun `showAodUI` incorrectly. If the timing was just right, this
would force the device into KEYGUARD state after being unlocked.

Fixes: 273681779
Test: manual, need to do the steps above
Test: atest FoldAodAnimationControllerTest
Change-Id: I09dc417d03763ede4d2bea1c7d51183503170a40
This commit is contained in:
Matt Pietal
2023-03-28 13:59:05 +00:00
parent 9ed16e1bee
commit f495f7f8c9
2 changed files with 29 additions and 1 deletions

View File

@@ -152,6 +152,7 @@ constructor(
} else if (isFolded && !isFoldHandled && alwaysOnEnabled && isDozing) {
// Screen turning on for the first time after folding and we are already dozing
// We should play the folding to AOD animation
isFoldHandled = true
setAnimationState(playing = true)
centralSurfaces.notificationPanelViewController.prepareFoldToAodAnimation()
@@ -186,7 +187,10 @@ constructor(
cancelAnimation?.run()
// Post starting the animation to the next frame to avoid junk due to inset changes
cancelAnimation = mainExecutor.executeDelayed(startAnimationRunnable, /* delayMillis= */ 0)
cancelAnimation = mainExecutor.executeDelayed(
startAnimationRunnable,
/* delayMillis= */ 0
)
shouldPlayAnimation = false
}
}

View File

@@ -50,6 +50,8 @@ import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.Captor
import org.mockito.Mock
import org.mockito.Mockito.never
import org.mockito.Mockito.reset
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.Mockito.`when` as whenever
@@ -173,6 +175,28 @@ class FoldAodAnimationControllerTest : SysuiTestCase() {
job.cancel()
}
@Test
fun onFolded_onScreenTurningOnInvokedTwice_doesNotLogLatency() =
runBlocking(IMMEDIATE) {
val job = underTest.listenForDozing(this)
keyguardRepository.setDozing(true)
setAodEnabled(enabled = true)
yield()
fold()
simulateScreenTurningOn()
reset(latencyTracker)
// This can happen > 1 time if the prox sensor is covered
simulateScreenTurningOn()
verify(latencyTracker, never()).onActionStart(any())
verify(latencyTracker, never()).onActionEnd(any())
job.cancel()
}
@Test
fun onFolded_animationCancelled_doesNotLogLatency() =
runBlocking(IMMEDIATE) {