Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b78051 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove forceAllNetworkTypes from test" am: bc48cdaf 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824613

Change-Id: I460b93a1a9d04ecdf687761eea3461ecf0346860
parents 90e0a894 bc48cdaf

core/java/android/net/NetworkTemplate.java

+2 −21
Original line number Diff line number Diff line
@@ -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.

     *

     * <p>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);

        }

    }