From 0309f92e24dc5a374e2a1bd8f839e7a66a92c170 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 9 Nov 2017 09:52:40 -0700 Subject: Move to NOT_ROAMING capability. Checking new capability is perferred way to verify a network isn't roaming; isRoaming() is now deprecated. Test: bit DownloadProviderTests:* Bug: 68397798 Change-Id: I11d19fd5a389b52e199c604a6906423d405072e2 --- .../android/providers/downloads/FakeSystemFacade.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'tests/src/com') diff --git a/tests/src/com/android/providers/downloads/FakeSystemFacade.java b/tests/src/com/android/providers/downloads/FakeSystemFacade.java index 387db51a..7087ce6d 100644 --- a/tests/src/com/android/providers/downloads/FakeSystemFacade.java +++ b/tests/src/com/android/providers/downloads/FakeSystemFacade.java @@ -1,5 +1,8 @@ package com.android.providers.downloads; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,6 +13,7 @@ import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; import android.net.ConnectivityManager; import android.net.Network; +import android.net.NetworkCapabilities; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; @@ -92,14 +96,20 @@ public class FakeSystemFacade implements SystemFacade { } else { final NetworkInfo info = new NetworkInfo(mActiveNetworkType, 0, null, null); info.setDetailedState(DetailedState.CONNECTED, null, null); - info.setRoaming(mIsRoaming); return info; } } @Override - public boolean isNetworkMetered(Network network) { - return mIsMetered; + public NetworkCapabilities getNetworkCapabilities(Network network) { + if (mActiveNetworkType == null) { + return null; + } else { + final NetworkCapabilities caps = new NetworkCapabilities(); + caps.setCapability(NET_CAPABILITY_NOT_METERED, !mIsMetered); + caps.setCapability(NET_CAPABILITY_NOT_ROAMING, !mIsRoaming); + return caps; + } } @Override -- cgit v1.2.3