Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d15c6de2 authored by Maxim Siniavine's avatar Maxim Siniavine Committed by Android Git Automerger
Browse files

am d9621f86: Merge "Make download manager tests more reliable." into jb-mr2-dev 

* commit 'd9621f86':
  Make download manager tests more reliable.
parents 3e3d9bbd d9621f86

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

+6 −6
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { 
     * @throws Exception if unsuccessful

     */

    public void runDownloadMultipleSwitching() throws Exception {

        String filename = DOWNLOAD_500K_FILENAME;

        long filesize = DOWNLOAD_500K_FILESIZE;

        String filename = DOWNLOAD_5MB_FILENAME;

        long filesize = DOWNLOAD_5MB_FILESIZE;

        doCommonDownloadSetup();



        String localDownloadDirectory = Environment.getExternalStorageDirectory().getPath();
@@ -340,8 +340,8 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { 
     * @throws Exception if unsuccessful

     */

    public void runDownloadMultipleWiFiEnableDisable() throws Exception {

        String filename = DOWNLOAD_500K_FILENAME;

        long filesize = DOWNLOAD_500K_FILESIZE;

        String filename = DOWNLOAD_5MB_FILENAME;

        long filesize = DOWNLOAD_5MB_FILESIZE;

        doCommonDownloadSetup();



        String localDownloadDirectory = Environment.getExternalStorageDirectory().getPath();
@@ -409,8 +409,8 @@ public class DownloadManagerTestApp extends DownloadManagerBaseTest { 
     * @throws Exception if unsuccessful

     */

    public void runDownloadMultipleAirplaneModeEnableDisable() throws Exception {

        String filename = DOWNLOAD_500K_FILENAME;

        long filesize = DOWNLOAD_500K_FILESIZE;

        String filename = DOWNLOAD_5MB_FILENAME;

        long filesize = DOWNLOAD_5MB_FILESIZE;

        // make sure WiFi is enabled, and airplane mode is not on

        doCommonDownloadSetup();