diff options
| author | George Mount <mount@google.com> | 2017-05-23 02:10:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-23 02:10:54 +0000 |
| commit | b8478f05238e3301806dd316005062459ccb6009 (patch) | |
| tree | fcaba15746bfa46d80aaefa999a5cc5b015f8611 /tests/fragment | |
| parent | 9e49406b51d24226130add25a4985462aa7ba151 (diff) | |
| parent | c86dd3f39c3cd9db6004a86e92fba52db68d0ff5 (diff) | |
| download | platform_cts-b8478f05238e3301806dd316005062459ccb6009.tar.gz platform_cts-b8478f05238e3301806dd316005062459ccb6009.tar.bz2 platform_cts-b8478f05238e3301806dd316005062459ccb6009.zip | |
Merge "Fix flaky FragmentAnimatorTest#hideAnimators()" into oc-dev am: 48caf51ba6
am: c86dd3f39c
Change-Id: Ic1a2b844961041b68d437a4d22e1ce19bde09da6
Diffstat (limited to 'tests/fragment')
| -rw-r--r-- | tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java b/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java index 67f90b46b7d..f99bb0b4283 100644 --- a/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java +++ b/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java @@ -542,7 +542,7 @@ public class FragmentAnimatorTest { assertEquals(animatorResourceId, fragment.resourceId); assertNotNull(fragment.animator); assertTrue(fragment.wasStarted); - assertTrue(fragment.endLatch.await(200, TimeUnit.MILLISECONDS)); + assertTrue(fragment.endLatch.await(1, TimeUnit.SECONDS)); } private void assertPostponed(AnimatorFragment fragment, int expectedAnimators) |