Merge "Suppress IndexOutOfBoundsException when cancelling low light animation" into udc-dev

This commit is contained in:
William Xiao
2023-07-07 18:18:10 +00:00
committed by Android (Google) Code Review

View File

@@ -111,8 +111,14 @@ class LowLightTransitionCoordinator @Inject constructor() {
} }
animator.addListener(listener) animator.addListener(listener)
continuation.invokeOnCancellation { continuation.invokeOnCancellation {
animator.removeListener(listener) try {
animator.cancel() animator.removeListener(listener)
animator.cancel()
} catch (exception: IndexOutOfBoundsException) {
// TODO(b/285666217): remove this try/catch once a proper fix is implemented.
// Cancelling the animator can cause an exception since we may be removing a
// listener during the cancellation. See b/285666217 for more details.
}
} }
} }
} }