CTS test for bug 33897722
am: 473aa82f4e
Change-Id: I1ec2518430967cf446a0007d7cec53aa006e668e
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 322f5d5..b76108b 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
@@ -69,13 +69,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 {
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index c4dab52..c7f13c9 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -157,12 +157,12 @@
#TODO(stuartscott): Maybe move away from com.android.* to android.* - less typing
self.__WritePlan(plan, 'PDK')
- # CTS - sub plan for Security
- plan = tools.TestPlan(packages)
- plan.Exclude('.*')
- plan.Include(r'android\.security$')
- plan.Include('android\.host\.jdwpsecurity$')
- self.__WritePlan(plan, 'Security')
+ # CTS - sub plan for Security
+ plan = tools.TestPlan(packages)
+ plan.Exclude('.*')
+ plan.Include(r'android\.security$')
+ plan.Include('android.\host.\jdwpsecurity$')
+ self.__WritePlan(plan, 'Security')
#dirty hack to copy over pre-populated CTS plans - flaky vs stable - to streamline autoCTS
shutil.copyfile(os.path.join(self.definedplans_repository, 'CTS-flaky.xml'),