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 /tests/src/com/android/providers | |
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 'tests/src/com/android/providers')
-rw-r--r-- | tests/src/com/android/providers/downloads/FakeSystemFacade.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/src/com/android/providers/downloads/FakeSystemFacade.java b/tests/src/com/android/providers/downloads/FakeSystemFacade.java index b6b800a2..de483c7f 100644 --- a/tests/src/com/android/providers/downloads/FakeSystemFacade.java +++ b/tests/src/com/android/providers/downloads/FakeSystemFacade.java @@ -1,6 +1,6 @@ package com.android.providers.downloads; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -21,6 +21,7 @@ import java.net.URLConnection; import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.List; + import javax.net.ssl.SSLContext; public class FakeSystemFacade implements SystemFacade { @@ -91,12 +92,16 @@ public class FakeSystemFacade implements SystemFacade { final NetworkInfo info = new NetworkInfo(mActiveNetworkType, 0, null, null); info.setDetailedState(DetailedState.CONNECTED, null, null); info.setRoaming(mIsRoaming); - info.setMetered(mIsMetered); return info; } } @Override + public boolean isNetworkMetered(Network network) { + return mIsMetered; + } + + @Override public long getMaxBytesOverMobile() { return mMaxBytesOverMobile; } |