summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2023-04-03 16:07:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-03 16:07:49 +0000
commit97978aab489a602c5d2bf2f0d670bffb41169427 (patch)
tree85ef91cd7ace64280ac9d819d5bf0ed9497aa0ba /packages
parentc1c9620236806a6c45eee42402f8607624d5d905 (diff)
parent73359104bae71f73c75065f50c54e7eb74486b38 (diff)
downloadbase-97978aab489a602c5d2bf2f0d670bffb41169427.tar.gz
Merge "Fix TestUnfoldProgressListener when there are no progress" into tm-qpr-dev am: 73359104ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22422232 Change-Id: I1b9be6c456af1409ab3bf289e85fd55f8ca30e28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt
index 39ea46a657f2..e2aef31b4f10 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt
@@ -126,7 +126,7 @@ class TestUnfoldProgressListener : UnfoldTransitionProgressProvider.TransitionPr
}
fun assertLastProgress(progress: Float) {
- waitForCondition { progress == progressHistory.last() }
+ waitForCondition { progress == progressHistory.lastOrNull() }
}
}