diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-07-12 10:59:43 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2017-07-14 11:45:03 -0600 |
| commit | c442fbd95ad5b3de9e58a11e431f419edb4fe978 (patch) | |
| tree | 4da61878939275317c2d7192af65a830f1dba09f /src/com/android/providers/downloads/DownloadThread.java | |
| parent | 221afa48c953769209fca5fca6e8d38e216e3c92 (diff) | |
| download | android_packages_providers_DownloadProvider-c442fbd95ad5b3de9e58a11e431f419edb4fe978.tar.gz android_packages_providers_DownloadProvider-c442fbd95ad5b3de9e58a11e431f419edb4fe978.tar.bz2 android_packages_providers_DownloadProvider-c442fbd95ad5b3de9e58a11e431f419edb4fe978.zip | |
Follow removal of NetworkInfo metered flag.
The OS now completely relies on NET_CAPABILITY_NOT_METERED to avoid
confusion and staleness.
Bug: 63391323
Test: builds, boots, Wi-Fi policy is upgraded
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: Iea83e0afd8cbd2be10d85b8a35c903047716b5b9
Diffstat (limited to 'src/com/android/providers/downloads/DownloadThread.java')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index e101c74d..b9849569 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -47,7 +47,6 @@ import static java.net.HttpURLConnection.HTTP_PRECON_FAILED; import static java.net.HttpURLConnection.HTTP_SEE_OTHER; import static java.net.HttpURLConnection.HTTP_UNAVAILABLE; -import android.app.job.JobInfo; import android.app.job.JobParameters; import android.content.ContentValues; import android.content.Context; @@ -743,7 +742,8 @@ public class DownloadThread extends Thread { if (info.isRoaming() && !mInfo.isRoamingAllowed()) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is roaming"); } - if (info.isMetered() && !mInfo.isMeteredAllowed(mInfoDelta.mTotalBytes)) { + if (mSystemFacade.isNetworkMetered(mNetwork) + && !mInfo.isMeteredAllowed(mInfoDelta.mTotalBytes)) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is metered"); } } |