diff options
| -rw-r--r-- | TEST_MAPPING | 15 | ||||
| -rw-r--r-- | src/com/android/providers/media/MediaProvider.java | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 1 | ||||
| -rw-r--r-- | tests/src/com/android/providers/media/IdleServiceTest.java | 14 |
4 files changed, 27 insertions, 5 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 000000000..f9008114b --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,15 @@ +{ + "presubmit": [ + { + "name": "MediaProviderTests" + }, + { + "name": "CtsProviderTestCases", + "options": [ + { + "include-annotation": "android.platform.test.annotations.Presubmit" + } + ] + } + ] +} diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index bf50b7863..ce66dc704 100644 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -4222,7 +4222,7 @@ public class MediaProvider extends ContentProvider { // Possibly bail before digging into each directory signal.throwIfCanceled(); - for (File thumbFile : thumbDir.listFiles()) { + for (File thumbFile : FileUtils.listFilesOrEmpty(thumbDir)) { final String name = ModernMediaScanner.extractName(thumbFile); try { final long id = Long.parseLong(name); diff --git a/tests/Android.bp b/tests/Android.bp index 208e06add..302be33f0 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,5 +1,6 @@ android_test { name: "MediaProviderTests", + test_suites: ["device-tests"], manifest: "AndroidManifest.xml", diff --git a/tests/src/com/android/providers/media/IdleServiceTest.java b/tests/src/com/android/providers/media/IdleServiceTest.java index 4b2129697..fa57bfad4 100644 --- a/tests/src/com/android/providers/media/IdleServiceTest.java +++ b/tests/src/com/android/providers/media/IdleServiceTest.java @@ -43,6 +43,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.io.File; +import java.io.IOException; @RunWith(AndroidJUnit4.class) public class IdleServiceTest { @@ -70,10 +71,10 @@ public class IdleServiceTest { final File c = buildPath(dir, Environment.DIRECTORY_PICTURES, ".thumbnails", id + ".jpg"); final File d = buildPath(dir, Environment.DIRECTORY_PICTURES, ".thumbnails", "random.bin"); - a.createNewFile(); - b.createNewFile(); - c.createNewFile(); - d.createNewFile(); + createNewFileWithMkdirs(a); + createNewFileWithMkdirs(b); + createNewFileWithMkdirs(c); + createNewFileWithMkdirs(d); // Idle maintenance pass should clean up unknown files try (ContentProviderClient cpc = isolatedResolver @@ -87,4 +88,9 @@ public class IdleServiceTest { assertTrue(c.exists()); assertFalse(d.exists()); } + + private static void createNewFileWithMkdirs(File file) throws IOException { + file.getParentFile().mkdirs(); + file.createNewFile(); + } } |