diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-26 20:57:17 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-26 20:57:17 +0000 |
commit | 44a6ccf7047ceb895a9c4b50934181da93ade297 (patch) | |
tree | 92a62c52dcadf9a3c329c5c22b1b67b4a0def9f7 | |
parent | be38051fdf1dc1e92e934522097a321c9c664d46 (diff) | |
parent | 640d347b31caada0e8c2664b700e1867cebcac05 (diff) | |
download | platform_cts-44a6ccf7047ceb895a9c4b50934181da93ade297.tar.gz platform_cts-44a6ccf7047ceb895a9c4b50934181da93ade297.tar.bz2 platform_cts-44a6ccf7047ceb895a9c4b50934181da93ade297.zip |
Merge cherrypicks of [12236535, 12236686, 12236706, 12236707, 12236708, 12236709, 12236710, 12236711, 12236687, 12236608, 12236629, 12236688, 12236459, 12236460, 12236536, 12236412] into rvc-release
Change-Id: Ib5bd52672341ef7ba5b2bd31d5b07323c7665bbc
-rw-r--r-- | hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java index 927f9f53955..dd47dd6f715 100644 --- a/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java +++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java @@ -82,6 +82,8 @@ public class AdoptableHostTest extends BaseHostJUnit4Test { hasVirtualDisk = result.startsWith("disk:"); } assertTrue("Virtual disk is not ready: " + result, hasVirtualDisk); + + waitForVolumeReady(); } } |