diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-08-08 18:27:23 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-08-08 18:27:23 -0600 |
| commit | 5ee3e34c2f5475178f005f6e904725f946f8d879 (patch) | |
| tree | aad993c5e0ec2009ed9c955c2c735c5b2eeade7a | |
| parent | 207050907be43f3d5941306d681644fd7a49d3cd (diff) | |
| parent | 971bdbf39c447e3b6afdbf51db32ef00ed933e0c (diff) | |
| download | android_packages_providers_DownloadProvider-5ee3e34c2f5475178f005f6e904725f946f8d879.tar.gz android_packages_providers_DownloadProvider-5ee3e34c2f5475178f005f6e904725f946f8d879.tar.bz2 android_packages_providers_DownloadProvider-5ee3e34c2f5475178f005f6e904725f946f8d879.zip | |
Merge tag 'android-8.1.0_r43' into staging/lineage-15.1_merge-android-8.1.0_r43
Android 8.1.0 release 43
* tag 'android-8.1.0_r43':
DO NOT MERGE: Update DownloadProvider for correct meteredness
Change-Id: Ia8bebaa361f2fd5a2a44eb4a6b9ff45b4593e6e5
4 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index 9dc51af9..01702fae 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -730,7 +730,7 @@ public class DownloadThread extends Thread { if (info.isRoaming() && !mInfo.isRoamingAllowed()) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is roaming"); } - if (mSystemFacade.isNetworkMetered(mNetwork) + if (mSystemFacade.isActiveNetworkMeteredForUid(mInfo.mUid) && !mInfo.isMeteredAllowed(mInfoDelta.mTotalBytes)) { throw new StopRequestException(STATUS_WAITING_FOR_NETWORK, "Network is metered"); } diff --git a/src/com/android/providers/downloads/RealSystemFacade.java b/src/com/android/providers/downloads/RealSystemFacade.java index 1c2ba581..2d9b3a30 100644 --- a/src/com/android/providers/downloads/RealSystemFacade.java +++ b/src/com/android/providers/downloads/RealSystemFacade.java @@ -68,6 +68,12 @@ class RealSystemFacade implements SystemFacade { } @Override + public boolean isActiveNetworkMeteredForUid(int uid) { + return mContext.getSystemService(ConnectivityManager.class) + .isActiveNetworkMeteredForUid(uid); + } + + @Override public long getMaxBytesOverMobile() { final Long value = DownloadManager.getMaxBytesOverMobile(mContext); return (value == null) ? Long.MAX_VALUE : value; diff --git a/src/com/android/providers/downloads/SystemFacade.java b/src/com/android/providers/downloads/SystemFacade.java index 53d14041..dec0cb28 100644 --- a/src/com/android/providers/downloads/SystemFacade.java +++ b/src/com/android/providers/downloads/SystemFacade.java @@ -38,6 +38,8 @@ interface SystemFacade { public boolean isNetworkMetered(Network network); + public boolean isActiveNetworkMeteredForUid(int uid); + /** * @return maximum size, in bytes, of downloads that may go over a mobile connection; or null if * there's no limit diff --git a/tests/src/com/android/providers/downloads/FakeSystemFacade.java b/tests/src/com/android/providers/downloads/FakeSystemFacade.java index de483c7f..aa7b8af4 100644 --- a/tests/src/com/android/providers/downloads/FakeSystemFacade.java +++ b/tests/src/com/android/providers/downloads/FakeSystemFacade.java @@ -102,6 +102,11 @@ public class FakeSystemFacade implements SystemFacade { } @Override + public boolean isActiveNetworkMeteredForUid(int uid) { + return mIsMetered; + } + + @Override public long getMaxBytesOverMobile() { return mMaxBytesOverMobile; } |