Add and enforce ALLOW_METERED column.

Include flag with each download to indicate if its allowed to proceed
over metered networks.  Downloads are left in WAITING_FOR_NETWORK
state, similar to how ALLOWED_NETWORK_TYPES is handled.

Also keep blocked downloads in WAITING_FOR_NETWORK state instead
of marking them as failed.

Bug: 3001465, 5734560
Change-Id: I80bb9aa9bd25ddf6f7a2472db344b6ba6878bd74

1 files changed, 0 insertions, 4 deletions

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 7108cec3..4de5134b 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -270,8 +270,6 @@ public class DownloadThread extends Thread {
             } else if (networkUsable == DownloadInfo.NETWORK_RECOMMENDED_UNUSABLE_DUE_TO_SIZE) {
                 status = Downloads.Impl.STATUS_QUEUED_FOR_WIFI;
                 mInfo.notifyPauseDueToSize(false);
-            } else if (networkUsable == DownloadInfo.NETWORK_BLOCKED) {
-                status = Downloads.Impl.STATUS_BLOCKED;
             }
             throw new StopRequestException(status,
                     mInfo.getLogMessageForNetworkError(networkUsable));
@@ -806,8 +804,6 @@ public class DownloadThread extends Thread {
                 case DownloadInfo.NETWORK_UNUSABLE_DUE_TO_SIZE:
                 case DownloadInfo.NETWORK_RECOMMENDED_UNUSABLE_DUE_TO_SIZE:
                     return Downloads.Impl.STATUS_QUEUED_FOR_WIFI;
-                case DownloadInfo.NETWORK_BLOCKED:
-                    return Downloads.Impl.STATUS_BLOCKED;
                 default:
                     return Downloads.Impl.STATUS_WAITING_FOR_NETWORK;
             }