commit c16d993238c0018efae7d82c1f9c688c2d18706c
author Zimuzo Ezeozue <zezeozue@google.com> Sat Mar 14 10:40:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 14 10:40:32 2020 +0000
tree 4daf894966652906f59eed8ca46f75dafe865e4d
parent 696dea4d5487b13b66a2b7313e1ba096b7d7df57
parent 67939818146edb4f1cf8cce32da2ca0eee8b0d30

Merge "Fix LegacyProviderMigrationTest" into rvc-dev

tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java

diff --git a/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java b/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
index ae63ac3..94c2a74 100644
--- a/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
+++ b/tests/client/src/com/android/providers/media/client/LegacyProviderMigrationTest.java
@@ -212,6 +212,9 @@
         // metadata from the legacy provider
         executeShellCommand("pm clear " + modernProvider.applicationInfo.packageName, ui);
 
+        // Sleep to give the MediaProvider time to recover from being killed after clearing data
+        Thread.sleep(5000);
+
         // And force a scan to confirm upgraded data survives
         MediaStore.waitForIdle(context.getContentResolver());
         MediaStore.scanVolume(context.getContentResolver(),