summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/providers
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2015-03-10 12:28:19 +0000
committerRicardo Cerqueira <ricardo@cyngn.com>2015-03-10 12:28:19 +0000
commit1958bec7cd1cd58a0ee83fcd837ff19c226d6470 (patch)
treee6bfd4d91dcfeb5d9dd1ce9adccafa3ac4574145 /tests/src/com/android/providers
parent05775ecc734a8fa1de16692962b5ee2808332b7e (diff)
parent1de359e31359f9aa6c500b378082e9d6e37d94b3 (diff)
downloadandroid_packages_providers_DownloadProvider-1958bec7cd1cd58a0ee83fcd837ff19c226d6470.tar.gz
android_packages_providers_DownloadProvider-1958bec7cd1cd58a0ee83fcd837ff19c226d6470.tar.bz2
android_packages_providers_DownloadProvider-1958bec7cd1cd58a0ee83fcd837ff19c226d6470.zip
Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1
Android 5.1.0 release 1
Diffstat (limited to 'tests/src/com/android/providers')
-rw-r--r--tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index d7b389c5..d1048b02 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -61,6 +61,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@LargeTest
@@ -239,7 +240,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest {
return buildResponse(HTTP_OK, STRING_1K)
.setHeader("Content-length", contentLength)
.setHeader("Etag", ETAG)
- .setBytesPerSecond(1024);
+ .throttleBody(1024, 1, TimeUnit.SECONDS);
}
public void testFiltering() throws Exception {