resolved conflicts for merge of 3d55d829 to gingerbread-plus-aosp

Change-Id: I18ede2f2d5ad8aa40cd61bdb7213659d356fdf57

1 files changed, 13 insertions, 3 deletions

diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index e48ce22e..d577e2c8 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -29,6 +29,8 @@ import tests.http.RecordedRequest;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.List;
@@ -89,9 +91,8 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest {
         assertEquals(REQUEST_PATH, request.getPath());
 
         Uri localUri = Uri.parse(download.getStringField(DownloadManager.COLUMN_LOCAL_URI));
-        assertEquals("file", localUri.getScheme());
-        assertStartsWith("//" + Environment.getDownloadCacheDirectory().getPath(),
-                         localUri.getSchemeSpecificPart());
+        assertEquals("content", localUri.getScheme());
+        checkUriContent(localUri);
         assertEquals("text/plain", download.getStringField(DownloadManager.COLUMN_MEDIA_TYPE));
 
         int size = FILE_CONTENT.length();
@@ -103,6 +104,15 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest {
         checkCompleteDownload(download);
     }
 
+    private void checkUriContent(Uri uri) throws FileNotFoundException, IOException {
+        InputStream inputStream = mResolver.openInputStream(uri);
+        try {
+            assertEquals(FILE_CONTENT, readStream(inputStream));
+        } finally {
+            inputStream.close();
+        }
+    }
+
     public void testTitleAndDescription() throws Exception {
         Download download = enqueueRequest(getRequest()
                                            .setTitle("my title")