commit 73359104bae71f73c75065f50c54e7eb74486b38
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 03 15:36:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 03 15:36:45 2023 +0000
tree 57fd2b0e8711e492bab15acab552cf65181fec52
parent 5b7b153349df76016d1f834e17d7ac6928655b0d
parent ca6d0d258e1ea8f227521646506cf4a42c5ac02a

Merge "Fix TestUnfoldProgressListener when there are no progress" into tm-qpr-dev

packages/SystemUI/tests/src/com/android/systemui/unfold/progress/TestUnfoldProgressListener.kt

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 39ea46a..e2aef31 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 @@
         }
 
         fun assertLastProgress(progress: Float) {
-            waitForCondition { progress == progressHistory.last() }
+            waitForCondition { progress == progressHistory.lastOrNull() }
         }
     }