diff options
author | Jeff Sharkey <jsharkey@android.com> | 2016-06-22 23:21:42 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 23:21:42 +0000 |
commit | 6c660bb04505a20c78883ffe1652cb0e50b2b00c (patch) | |
tree | bd9c53dbef97766d6c163df9275a1321bfc0bfac | |
parent | b7ed6f24cc051391b44ba58d24508905a462cd7f (diff) | |
parent | b5ca499c7417fc5954b6914d6d52e6e2c02ce7d8 (diff) | |
download | android_packages_providers_DownloadProvider-6c660bb04505a20c78883ffe1652cb0e50b2b00c.tar.gz android_packages_providers_DownloadProvider-6c660bb04505a20c78883ffe1652cb0e50b2b00c.tar.bz2 android_packages_providers_DownloadProvider-6c660bb04505a20c78883ffe1652cb0e50b2b00c.zip |
Re-schedule downloads queued for unmetered.
am: b5ca499c74
Change-Id: If70296f5a8a463430513d5fb0bbb34811e632025
-rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 4 | ||||
-rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java index 8996eded..00a2dd78 100644 --- a/src/com/android/providers/downloads/DownloadInfo.java +++ b/src/com/android/providers/downloads/DownloadInfo.java @@ -368,6 +368,10 @@ public class DownloadInfo { return false; } + public boolean isMeteredAllowed(long totalBytes) { + return getRequiredNetworkType(totalBytes) != JobInfo.NETWORK_TYPE_UNMETERED; + } + public boolean isRoamingAllowed() { if (mIsPublicApi) { return mAllowRoaming; diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index 34d6ad1a..60a04ff1 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -353,6 +353,13 @@ public class DownloadThread extends Thread { } } + // If we're waiting for a network that must be unmetered, our status + // is actually queued so we show relevant notifications + if (mInfoDelta.mStatus == STATUS_WAITING_FOR_NETWORK + && !mInfo.isMeteredAllowed(mInfoDelta.mTotalBytes)) { + mInfoDelta.mStatus = STATUS_QUEUED_FOR_WIFI; + } + } catch (Throwable t) { mInfoDelta.mStatus = STATUS_UNKNOWN_ERROR; mInfoDelta.mErrorMsg = t.toString(); @@ -380,7 +387,8 @@ public class DownloadThread extends Thread { DownloadScanner.requestScanBlocking(mContext, mInfo); } } else if (mInfoDelta.mStatus == STATUS_WAITING_TO_RETRY - || mInfoDelta.mStatus == STATUS_WAITING_FOR_NETWORK) { + || mInfoDelta.mStatus == STATUS_WAITING_FOR_NETWORK + || mInfoDelta.mStatus == STATUS_QUEUED_FOR_WIFI) { Helpers.scheduleJob(mContext, DownloadInfo.queryDownloadInfo(mContext, mId)); } @@ -727,20 +735,16 @@ public class DownloadThread extends Thread { // checking connectivity will apply current policy mPolicyDirty = false; - final boolean allowMetered = mInfo - .getRequiredNetworkType(mInfoDelta.mTotalBytes) != JobInfo.NETWORK_TYPE_UNMETERED; - final boolean allowRoaming = mInfo.isRoamingAllowed(); - final NetworkInfo info = mSystemFacade.getNetworkInfo(mNetwork, mInfo.mUid, mIgnoreBlocked); if (info == null || !info.isConnected()) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is disconnected"); } - if (info.isRoaming() && !allowRoaming) { + if (info.isRoaming() && !mInfo.isRoamingAllowed()) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is roaming"); } - if (info.isMetered() && !allowMetered) { - throw new StopRequestException(STATUS_QUEUED_FOR_WIFI, "Network is metered"); + if (info.isMetered() && !mInfo.isMeteredAllowed(mInfoDelta.mTotalBytes)) { + throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is metered"); } } |