Snap for 5537346 from ab55bc184442d7b5367c1d9f4848c9229ab13529 to qt-release

Change-Id: Id1f51e6278e1914cda37db7758d087ae3a7cc8cf

2 files changed, 11 insertions, 3 deletions

diff --git a/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java b/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java
index 3a585b47..bb89b6f6 100644
--- a/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java
+++ b/tests/src/com/android/providers/downloads/AbstractPublicApiTest.java
@@ -26,6 +26,7 @@ import android.content.ContentResolver;
 import android.content.ContextWrapper;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.os.SystemClock;
 import android.util.Log;
@@ -238,6 +239,13 @@ public abstract class AbstractPublicApiTest extends AbstractDownloadProviderFunc
         return getRequest(getServerUri(REQUEST_PATH));
     }
 
+    protected DownloadManager.Request getRequestWithDestinationDownloadsDir()
+            throws MalformedURLException, UnknownHostException {
+        final DownloadManager.Request request = getRequest();
+        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "testfile.txt");
+        return request;
+    }
+
     protected DownloadManager.Request getRequest(String path) {
         return new DownloadManager.Request(Uri.parse(path));
     }
diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index cabcc313..ae0e7e52 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -250,15 +250,15 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest {
         enqueueResponse(buildEmptyResponse(HTTP_OK));
         enqueueResponse(buildEmptyResponse(HTTP_NOT_FOUND));
 
-        Download download1 = enqueueRequest(getRequest());
+        Download download1 = enqueueRequest(getRequestWithDestinationDownloadsDir());
         download1.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL);
 
         mSystemFacade.incrementTimeMillis(1); // ensure downloads are correctly ordered by time
-        Download download2 = enqueueRequest(getRequest());
+        Download download2 = enqueueRequest(getRequestWithDestinationDownloadsDir());
         download2.runUntilStatus(DownloadManager.STATUS_FAILED);
 
         mSystemFacade.incrementTimeMillis(1);
-        Download download3 = enqueueRequest(getRequest());
+        Download download3 = enqueueRequest(getRequestWithDestinationDownloadsDir());
 
         Cursor cursor = mManager.query(new DownloadManager.Query());
         checkAndCloseCursor(cursor, download3, download2, download1);