From da213c052e7b210f83891b36aa748cd7e72f96f0 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Fri, 10 Sep 2021 03:20:50 +0800 Subject: [PATCH] Remove forceAllNetworkTypes from test A test should test the actual behavior as much as possible. However, if the flag is true, matchesMobile/matchesMobileWildcard will always return true regardless of the network type and metered. Thus, remove this flag would be closer to the actual behavior. Bug: 183776809 Test: atest FrameworksNetTests Change-Id: I0907a08ca1dd8a14a738db4057ea5ff6a0cd925a --- core/java/android/net/NetworkTemplate.java | 23 ++-------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index 68917a8288..08f75df5d8 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -47,7 +47,6 @@ import android.text.TextUtils; import android.util.BackupUtils; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import com.android.net.module.util.NetworkIdentityUtils; @@ -151,24 +150,6 @@ public class NetworkTemplate implements Parcelable { } } - private static boolean sForceAllNetworkTypes = false; - - /** - * Results in matching against all mobile network types. - * - *

See {@link #matchesMobile} and {@link matchesMobileWildcard}. - */ - @VisibleForTesting - public static void forceAllNetworkTypes() { - sForceAllNetworkTypes = true; - } - - /** Resets the affect of {@link #forceAllNetworkTypes}. */ - @VisibleForTesting - public static void resetForceAllNetworkTypes() { - sForceAllNetworkTypes = false; - } - /** * Template to match {@link ConnectivityManager#TYPE_MOBILE} networks with * the given IMSI. @@ -611,7 +592,7 @@ public class NetworkTemplate implements Parcelable { // Only metered mobile network would be matched regardless of metered filter. // This is used to exclude non-metered APNs, e.g. IMS. See ag/908650. // TODO: Respect metered filter and remove mMetered condition. - return (sForceAllNetworkTypes || (ident.mType == TYPE_MOBILE && ident.mMetered)) + return (ident.mType == TYPE_MOBILE && ident.mMetered) && !ArrayUtils.isEmpty(mMatchSubscriberIds) && ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId) && matchesCollapsedRatType(ident); @@ -726,7 +707,7 @@ public class NetworkTemplate implements Parcelable { if (ident.mType == TYPE_WIMAX) { return true; } else { - return (sForceAllNetworkTypes || (ident.mType == TYPE_MOBILE && ident.mMetered)) + return (ident.mType == TYPE_MOBILE && ident.mMetered) && matchesCollapsedRatType(ident); } }