diff options
2 files changed, 6 insertions, 6 deletions
diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerBaseTest.java b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerBaseTest.java index acd2a188dada..334661d9c697 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerBaseTest.java +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerBaseTest.java @@ -491,9 +491,10 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase { * * @param id The download id to query on (wait for) */ - private void waitForDownloadOrTimeout_skipNotification(long id) throws TimeoutException, + protected void waitForDownloadOrTimeout_skipNotification(long id) throws TimeoutException, InterruptedException { - waitForDownloadOrTimeout(id, WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME); + doWaitForDownloadsOrTimeout(new Query().setFilterById(id), + WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME); } /** @@ -505,8 +506,7 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase { */ protected void waitForDownloadOrTimeout(long id) throws TimeoutException, InterruptedException { - waitForDownloadOrTimeout_skipNotification(id); - waitForReceiverNotifications(1); + waitForDownloadOrTimeout(id, WAIT_FOR_DOWNLOAD_POLL_TIME, MAX_WAIT_FOR_DOWNLOAD_TIME); } /** @@ -813,4 +813,4 @@ public class DownloadManagerBaseTest extends InstrumentationTestCase { } return cursor; } -}
\ No newline at end of file +} diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java index ba5ee2cc6ef7..654f74794ac3 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java @@ -208,7 +208,7 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { // Wait until the download finishes; don't wait for a notification b/c // the download may well have been completed before the last reboot. - waitForDownloadOrTimeout(dlRequest); + waitForDownloadOrTimeout_skipNotification(dlRequest); Log.i(LOG_TAG, "Verifying download information..."); // Verify specific info about the file (size, name, etc)... |