Merge "Add mediaStore.waitForIdle before scans" into sc-dev
diff --git a/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java b/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
index cc355d0..cc570b3 100644
--- a/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
+++ b/tests/src/com/android/providers/media/scan/ModernMediaScannerTest.java
@@ -1218,6 +1218,7 @@
         File renamedTestDir = new File(mIsolatedContext.getExternalMediaDirs()[0],
                 "renamed_test_" + System.nanoTime());
         assertThat(mDir.renameTo(renamedTestDir)).isTrue();
+        MediaStore.waitForIdle(mIsolatedResolver);
 
         Timer renamedDirScan = new Timer("renamedDirScan");
         renamedDirScan.start();