diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-11 23:51:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-11 23:51:49 +0000 |
| commit | c77293b7a92590e5583b9af0e4a6128d841f8c6f (patch) | |
| tree | d9e78784368f45336b6d4474d627815d6f4cec17 /tests/net/java | |
| parent | 2273adedcd2b5f0a36cbd3eade0d4494ca5e2ba8 (diff) | |
| parent | 3c6140d8cc01ffb8b6d2ae17c94aa55d33e3383e (diff) | |
Merge changes from topic "ethernet_specifier"
* changes:
Fix common tests on Q and R
Add Ethernet, TestNetworkSpecifier API
Diffstat (limited to 'tests/net/java')
| -rw-r--r-- | tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java b/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java index 950d7163c78a..38f6d7f3172d 100644 --- a/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java +++ b/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java @@ -46,12 +46,12 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.res.Resources; import android.net.ConnectivityManager; +import android.net.EthernetNetworkSpecifier; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkPolicy; import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; -import android.net.StringNetworkSpecifier; import android.net.TelephonyNetworkSpecifier; import android.os.Handler; import android.os.UserHandle; @@ -240,7 +240,7 @@ public class MultipathPolicyTrackerTest { NetworkCapabilities capabilities = new NetworkCapabilities() .addCapability(NET_CAPABILITY_INTERNET) .addTransportType(TRANSPORT_CELLULAR) - .setNetworkSpecifier(new StringNetworkSpecifier("234")); + .setNetworkSpecifier(new EthernetNetworkSpecifier("eth234")); if (!roaming) { capabilities.addCapability(NET_CAPABILITY_NOT_ROAMING); } |