Merge "Fixing DownloadManager Test app."

Author: tommynnguyen

core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerBaseTest.java

@@ -491,9 +491,10 @@ protected void setAirplaneModeOn(boolean enable) throws Exception {
      *
      * @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 @@ private void waitForDownloadOrTimeout_skipNotification(long id) throws TimeoutEx
      */
     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 @@ protected Cursor getCursor(long id) throws Exception {
         }
         return cursor;
     }
-}
+}

core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/DownloadManagerTestApp.java

@@ -208,7 +208,7 @@ public void verifyFileDownloadSucceeded() throws Exception {
 
             // 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)...