From 89764da1322c40cbdc9712dfe7c89bd54cf56830 Mon Sep 17 00:00:00 2001 From: junyulai Date: Fri, 19 Mar 2021 14:09:44 +0800 Subject: [PATCH] Replace references of request.networkCapabilies Replaced by request.canBesatisfiedBy() to avoid direct reference of hidden member. Bug: 182963415 Test: m ethernet-service Test: atest EthernetServiceTests Change-Id: I2a27410a6148c525e17a11cb1ba3570f04e60b5d --- .../android/server/ethernet/EthernetNetworkFactory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java index ad48844224..89334ba01a 100644 --- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/service-t/src/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; }