Add a 5 second timeout to launch animation touch blocking

This is a workaround for b/288507023, which is caused by launch
animations hanging. It does not address the cause of the animation
not completing, but it will allow users to resume interacting with
their device after 5 seconds.

Test: added unit test
Test: simulated the bug with a temporary change and verified manually
Bug: 288507023
Change-Id: I5c240a9ee852bf57e8ec251b733708086e825b45
Merged-In: I5c240a9ee852bf57e8ec251b733708086e825b45
This commit is contained in:
Justin Weir
2023-08-18 09:33:00 -04:00
parent 2fd15e5d7d
commit 6e264abf4a
2 changed files with 47 additions and 2 deletions

View File

@@ -105,7 +105,14 @@ public class NotificationShadeWindowViewController {
private boolean mTouchActive; private boolean mTouchActive;
private boolean mTouchCancelled; private boolean mTouchCancelled;
private MotionEvent mDownEvent; private MotionEvent mDownEvent;
// TODO rename to mLaunchAnimationRunning
private boolean mExpandAnimationRunning; private boolean mExpandAnimationRunning;
/**
* When mExpandAnimationRunning is true and the touch dispatcher receives a down even after
* uptime exceeds this, the dispatcher will stop blocking touches for the launch animation,
* which has presumabely not completed due to an error.
*/
private long mLaunchAnimationTimeout;
private NotificationStackScrollLayout mStackScrollLayout; private NotificationStackScrollLayout mStackScrollLayout;
private PhoneStatusBarViewController mStatusBarViewController; private PhoneStatusBarViewController mStatusBarViewController;
private final CentralSurfaces mService; private final CentralSurfaces mService;
@@ -266,7 +273,12 @@ public class NotificationShadeWindowViewController {
return logDownDispatch(ev, "touch cancelled", false); return logDownDispatch(ev, "touch cancelled", false);
} }
if (mExpandAnimationRunning) { if (mExpandAnimationRunning) {
return logDownDispatch(ev, "expand animation running", false); if (isDown && mClock.uptimeMillis() > mLaunchAnimationTimeout) {
mShadeLogger.d("NSWVC: launch animation timed out");
setExpandAnimationRunning(false);
} else {
return logDownDispatch(ev, "expand animation running", false);
}
} }
if (mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()) { if (mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()) {
@@ -548,6 +560,9 @@ public class NotificationShadeWindowViewController {
public void setExpandAnimationRunning(boolean running) { public void setExpandAnimationRunning(boolean running) {
if (mExpandAnimationRunning != running) { if (mExpandAnimationRunning != running) {
if (running) {
mLaunchAnimationTimeout = mClock.uptimeMillis() + 5000;
}
mExpandAnimationRunning = running; mExpandAnimationRunning = running;
mNotificationShadeWindowController.setLaunchingActivity(mExpandAnimationRunning); mNotificationShadeWindowController.setLaunchingActivity(mExpandAnimationRunning);
} }

View File

@@ -110,6 +110,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
@Mock @Mock
lateinit var primaryBouncerToGoneTransitionViewModel: PrimaryBouncerToGoneTransitionViewModel lateinit var primaryBouncerToGoneTransitionViewModel: PrimaryBouncerToGoneTransitionViewModel
private lateinit var fakeClock: FakeSystemClock
private lateinit var interactionEventHandlerCaptor: ArgumentCaptor<InteractionEventHandler> private lateinit var interactionEventHandlerCaptor: ArgumentCaptor<InteractionEventHandler>
private lateinit var interactionEventHandler: InteractionEventHandler private lateinit var interactionEventHandler: InteractionEventHandler
@@ -148,6 +149,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
), ),
inputProxy = inputProxy, inputProxy = inputProxy,
) )
fakeClock = FakeSystemClock()
underTest = underTest =
NotificationShadeWindowViewController( NotificationShadeWindowViewController(
lockscreenShadeTransitionController, lockscreenShadeTransitionController,
@@ -176,7 +178,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
primaryBouncerToGoneTransitionViewModel, primaryBouncerToGoneTransitionViewModel,
featureFlags, featureFlags,
{ multiShadeInteractor }, { multiShadeInteractor },
FakeSystemClock(), fakeClock,
{ {
MultiShadeMotionEventInteractor( MultiShadeMotionEventInteractor(
applicationContext = context, applicationContext = context,
@@ -330,6 +332,33 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
assertThat(returnVal).isTrue() assertThat(returnVal).isTrue()
} }
@Test
fun handleDispatchTouchEvent_launchAnimationRunningTimesOut() =
testScope.runTest {
// GIVEN touch dispatcher in a state that returns true
underTest.setStatusBarViewController(phoneStatusBarViewController)
whenever(keyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()).thenReturn(
true
)
assertThat(interactionEventHandler.handleDispatchTouchEvent(DOWN_EVENT)).isTrue()
// WHEN launch animation is running for 2 seconds
fakeClock.setUptimeMillis(10000)
underTest.setExpandAnimationRunning(true)
fakeClock.advanceTime(2000)
// THEN touch is ignored
assertThat(interactionEventHandler.handleDispatchTouchEvent(DOWN_EVENT)).isFalse()
// WHEN Launch animation is running for 6 seconds
fakeClock.advanceTime(4000)
// THEN move is ignored, down is handled, and window is notified
assertThat(interactionEventHandler.handleDispatchTouchEvent(MOVE_EVENT)).isFalse()
assertThat(interactionEventHandler.handleDispatchTouchEvent(DOWN_EVENT)).isTrue()
verify(notificationShadeWindowController).setLaunchingActivity(false)
}
@Test @Test
fun shouldInterceptTouchEvent_statusBarKeyguardViewManagerShouldIntercept() { fun shouldInterceptTouchEvent_statusBarKeyguardViewManagerShouldIntercept() {
// down event should be intercepted by keyguardViewManager // down event should be intercepted by keyguardViewManager
@@ -350,6 +379,7 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() {
companion object { companion object {
private val DOWN_EVENT = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, 0f, 0f, 0) private val DOWN_EVENT = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, 0f, 0f, 0)
private val MOVE_EVENT = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 0f, 0f, 0)
private const val VIEW_BOTTOM = 100 private const val VIEW_BOTTOM = 100
} }
} }