diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-01-12 15:01:04 -0800 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-01-12 15:01:04 -0800 |
commit | 97862429de71477b5c4488faa911a2256b90089b (patch) | |
tree | be294c3314b240e29ad8b8206bb4e7c106c80adb /src/com/android/providers/downloads/DownloadThread.java | |
parent | 89afc754d46a8574a9e014c7670746668de9f9b3 (diff) | |
download | android_packages_providers_DownloadProvider-97862429de71477b5c4488faa911a2256b90089b.tar.gz android_packages_providers_DownloadProvider-97862429de71477b5c4488faa911a2256b90089b.tar.bz2 android_packages_providers_DownloadProvider-97862429de71477b5c4488faa911a2256b90089b.zip |
Move network state to enums for type safety.
Change-Id: Ib8ea24fc58a866f8a5626cdd20e5891eb0a2bbeb
Diffstat (limited to 'src/com/android/providers/downloads/DownloadThread.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index c77224a7..15183117 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -50,6 +50,8 @@ import android.text.TextUtils; import android.util.Log; import android.util.Pair; +import com.android.providers.downloads.DownloadInfo.NetworkState; + import java.io.File; import java.io.FileDescriptor; import java.io.FileOutputStream; @@ -402,18 +404,17 @@ public class DownloadThread extends Thread { // checking connectivity will apply current policy mPolicyDirty = false; - int networkUsable = mInfo.checkCanUseNetwork(); - if (networkUsable != DownloadInfo.NETWORK_OK) { + final NetworkState networkUsable = mInfo.checkCanUseNetwork(); + if (networkUsable != NetworkState.OK) { int status = Downloads.Impl.STATUS_WAITING_FOR_NETWORK; - if (networkUsable == DownloadInfo.NETWORK_UNUSABLE_DUE_TO_SIZE) { + if (networkUsable == NetworkState.UNUSABLE_DUE_TO_SIZE) { status = Downloads.Impl.STATUS_QUEUED_FOR_WIFI; mInfo.notifyPauseDueToSize(true); - } else if (networkUsable == DownloadInfo.NETWORK_RECOMMENDED_UNUSABLE_DUE_TO_SIZE) { + } else if (networkUsable == NetworkState.RECOMMENDED_UNUSABLE_DUE_TO_SIZE) { status = Downloads.Impl.STATUS_QUEUED_FOR_WIFI; mInfo.notifyPauseDueToSize(false); } - throw new StopRequestException(status, - mInfo.getLogMessageForNetworkError(networkUsable)); + throw new StopRequestException(status, networkUsable.name()); } } @@ -704,11 +705,11 @@ public class DownloadThread extends Thread { } private int getFinalStatusForHttpError(State state) { - int networkUsable = mInfo.checkCanUseNetwork(); - if (networkUsable != DownloadInfo.NETWORK_OK) { + final NetworkState networkUsable = mInfo.checkCanUseNetwork(); + if (networkUsable != NetworkState.OK) { switch (networkUsable) { - case DownloadInfo.NETWORK_UNUSABLE_DUE_TO_SIZE: - case DownloadInfo.NETWORK_RECOMMENDED_UNUSABLE_DUE_TO_SIZE: + case UNUSABLE_DUE_TO_SIZE: + case RECOMMENDED_UNUSABLE_DUE_TO_SIZE: return Downloads.Impl.STATUS_QUEUED_FOR_WIFI; default: return Downloads.Impl.STATUS_WAITING_FOR_NETWORK; |