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

Commit 2e49589c authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "VCN: Require capability matching on test networks for CTS" am:... 

Merge "VCN: Require capability matching on test networks for CTS" am: 9be9f000 am: bc5cc7a8 am: b1080221

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



Change-Id: I6e341b8d9608f63bc5f4595e1999d68af9b9e2c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c233eb4 b1080221

core/java/android/net/vcn/VcnCellUnderlyingNetworkTemplate.java

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ public final class VcnCellUnderlyingNetworkTemplate extends VcnUnderlyingNetwork 
    }



    /** @hide */

    @Override

    public Map<Integer, Integer> getCapabilitiesMatchCriteria() {

        return Collections.unmodifiableMap(new HashMap<>(mCapabilitiesMatchCriteria));

    }

core/java/android/net/vcn/VcnUnderlyingNetworkTemplate.java

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.internal.util.Preconditions; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Map;

import java.util.Objects;



/**
@@ -307,4 +308,7 @@ public abstract class VcnUnderlyingNetworkTemplate { 
    public int getMinExitDownstreamBandwidthKbps() {

        return mMinExitDownstreamBandwidthKbps;

    }



    /** @hide */

    public abstract Map<Integer, Integer> getCapabilitiesMatchCriteria();

}

core/java/android/net/vcn/VcnWifiUnderlyingNetworkTemplate.java

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 */

package android.net.vcn;



import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.vcn.VcnUnderlyingNetworkTemplate.MATCH_ANY;



import static com.android.internal.annotations.VisibleForTesting.Visibility;

import static com.android.server.vcn.util.PersistableBundleUtils.STRING_DESERIALIZER;

import static com.android.server.vcn.util.PersistableBundleUtils.STRING_SERIALIZER;
@@ -23,6 +26,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.net.NetworkCapabilities;

import android.net.vcn.VcnUnderlyingNetworkTemplate.MatchCriteria;

import android.os.PersistableBundle;

import android.util.ArraySet;
@@ -32,6 +36,7 @@ import com.android.server.vcn.util.PersistableBundleUtils; 


import java.util.ArrayList;

import java.util.Collections;

import java.util.Map;

import java.util.Objects;

import java.util.Set;
@@ -162,6 +167,12 @@ public final class VcnWifiUnderlyingNetworkTemplate extends VcnUnderlyingNetwork 
        return Collections.unmodifiableSet(mSsids);

    }



    /** @hide */

    @Override

    public Map<Integer, Integer> getCapabilitiesMatchCriteria() {

        return Collections.singletonMap(NET_CAPABILITY_INTERNET, MATCH_REQUIRED);

    }



    /** This class is used to incrementally build VcnWifiUnderlyingNetworkTemplate objects. */

    public static final class Builder {

        private int mMeteredMatchCriteria = MATCH_ANY;

services/core/java/com/android/server/vcn/routeselection/NetworkPriorityClassifier.java

+12 −12
Original line number Diff line number Diff line
@@ -171,6 +171,18 @@ class NetworkPriorityClassifier { 
            return false;

        }



        for (Map.Entry<Integer, Integer> entry :

                networkPriority.getCapabilitiesMatchCriteria().entrySet()) {

            final int cap = entry.getKey();

            final int matchCriteria = entry.getValue();



            if (matchCriteria == MATCH_REQUIRED && !caps.hasCapability(cap)) {

                return false;

            } else if (matchCriteria == MATCH_FORBIDDEN && caps.hasCapability(cap)) {

                return false;

            }

        }



        if (vcnContext.isInTestMode() && caps.hasTransport(TRANSPORT_TEST)) {

            return true;

        }
@@ -319,18 +331,6 @@ class NetworkPriorityClassifier { 
            return false;

        }



        for (Map.Entry<Integer, Integer> entry :

                networkPriority.getCapabilitiesMatchCriteria().entrySet()) {

            final int cap = entry.getKey();

            final int matchCriteria = entry.getValue();



            if (matchCriteria == MATCH_REQUIRED && !caps.hasCapability(cap)) {

                return false;

            } else if (matchCriteria == MATCH_FORBIDDEN && caps.hasCapability(cap)) {

                return false;

            }

        }



        return true;

    }