diff options
author | junyulai <junyulai@google.com> | 2021-03-19 09:44:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 09:44:07 +0000 |
commit | c6c2173615011b1971d0d3823d399c9695d28d7c (patch) | |
tree | c91d6b2c30ca86f8c191c2c04778e6c4a6d23ec6 | |
parent | 31593d6caa791ff6611d0bda92757a924f2bff5b (diff) | |
parent | 71ada855d78aeafbc1f5c394f13d12ee929eb7f5 (diff) | |
download | ethernet-c6c2173615011b1971d0d3823d399c9695d28d7c.tar.gz |
Replace references of request.networkCapabilies am: 8f28acca65 am: ea792da985 am: 71ada855d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645030
Change-Id: I3adb0e07f10c4a94c9517b7ba342bbfc7b6e7867
-rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index ad48844..89334ba 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -17,6 +17,7 @@ package com.android.server.ethernet; import static android.net.shared.LinkPropertiesParcelableUtil.toStableParcelable; + import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.NonNull; @@ -50,8 +51,8 @@ import android.util.SparseArray; import com.android.internal.util.IndentingPrintWriter; import java.io.FileDescriptor; -import java.util.concurrent.ConcurrentHashMap; import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; /** * {@link NetworkFactory} that represents Ethernet networks. @@ -224,12 +225,12 @@ public class EthernetNetworkFactory extends NetworkFactory { NetworkInterfaceState network = null; if (!TextUtils.isEmpty(requestedIface)) { NetworkInterfaceState n = mTrackingInterfaces.get(requestedIface); - if (n != null && n.satisfied(request.networkCapabilities)) { + if (n != null && request.canBeSatisfiedBy(n.mCapabilities)) { network = n; } } else { for (NetworkInterfaceState n : mTrackingInterfaces.values()) { - if (n.satisfied(request.networkCapabilities) && n.mLinkUp) { + if (request.canBeSatisfiedBy(n.mCapabilities) && n.mLinkUp) { network = n; break; } |