Merge "Don't specify target_sdk_version" into rvc-dev
diff --git a/tests/functional/com/android/documentsui/ContextMenuUiTest.java b/tests/functional/com/android/documentsui/ContextMenuUiTest.java
index 8032240..57ee1d3 100644
--- a/tests/functional/com/android/documentsui/ContextMenuUiTest.java
+++ b/tests/functional/com/android/documentsui/ContextMenuUiTest.java
@@ -86,7 +86,6 @@
public void testContextMenu_onDir() throws Exception {
menuItems.put("Cut", true);
menuItems.put("Copy", true);
- menuItems.put("Paste into folder", true);
menuItems.put("Open in new window", true);
menuItems.put("Delete", true);
menuItems.put("Rename", true);
@@ -106,7 +105,6 @@
public void testContextMenu_onEmptyArea() throws Exception {
menuItems.put("Select all", true);
- menuItems.put("Paste", true);
menuItems.put("New folder", true);
Rect dirListBounds = bots.directory.findDocumentsList().getBounds();
Rect dirBounds = bots.directory.findDocument(dirName1).getBounds();
diff --git a/tests/unit/com/android/documentsui/services/AbstractJobTest.java b/tests/unit/com/android/documentsui/services/AbstractJobTest.java
index b651a87..19138f9 100644
--- a/tests/unit/com/android/documentsui/services/AbstractJobTest.java
+++ b/tests/unit/com/android/documentsui/services/AbstractJobTest.java
@@ -76,6 +76,9 @@
mDocs = new DocumentsProviderHelper(mUserId, AUTHORITY, mContext, AUTHORITY);
+ // Reset storage before starting the tests.
+ resetStorage();
+
initTestFiles();
}