am 1ebc592c: am 19da3f7c: am b792d3c6: am 934180d9: am 2739fb79: am 678dc41d: am 655ec491: am 2e452ccf: am a0b1c0f9: Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.
* commit '1ebc592c3e1fb9ef82d6712a4ea0a5692dd0084d':
Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
index 3f28a34..e68286f 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
@@ -78,13 +78,6 @@
mHelper = new FileCopyHelper(mContext);
mRowsAdded = new ArrayList<Uri>();
-
- String campath = Environment.getExternalStorageDirectory() + File.separator +
- Environment.DIRECTORY_DCIM + File.separator + "Camera";
- File camfile = new File(campath);
- if (!camfile.exists()) {
- assertTrue("failed to create " + campath, camfile.mkdir());
- }
}
public void testInsertImageWithImagePath() throws Exception {
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
index 03adad7..e8a13a9 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
@@ -68,13 +68,6 @@
mHelper = new FileCopyHelper(mContext);
mRowsAdded = new ArrayList<Uri>();
-
- String campath = Environment.getExternalStorageDirectory() + File.separator +
- Environment.DIRECTORY_DCIM + File.separator + "Camera";
- File camfile = new File(campath);
- if (!camfile.exists()) {
- assertTrue("failed to create " + campath, camfile.mkdir());
- }
}
public void testQueryInternalThumbnails() throws Exception {