LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace references of request.networkCapabilies

Browse Source 
Replaced by request.canBesatisfiedBy() to avoid direct reference
of hidden member.

Bug: 182963415
Test: m ethernet-service
Test: atest EthernetServiceTests
Change-Id: I2a27410a6148c525e17a11cb1ba3570f04e60b5d
This commit is contained in:
junyulai
2021-03-19 14:09:44 +08:00
parent df51759103
commit 89764da132
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -17,6 +17,7 @@
package com.android.server.ethernet; package com.android.server.ethernet;
import static android.net.shared.LinkPropertiesParcelableUtil.toStableParcelable; import static android.net.shared.LinkPropertiesParcelableUtil.toStableParcelable;
import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -50,8 +51,8 @@ import android.util.SparseArray;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* {@link NetworkFactory} that represents Ethernet networks. * {@link NetworkFactory} that represents Ethernet networks.
@@ -224,12 +225,12 @@ public class EthernetNetworkFactory extends NetworkFactory {
NetworkInterfaceState network = null; NetworkInterfaceState network = null;
if (!TextUtils.isEmpty(requestedIface)) { if (!TextUtils.isEmpty(requestedIface)) {
NetworkInterfaceState n = mTrackingInterfaces.get(requestedIface); NetworkInterfaceState n = mTrackingInterfaces.get(requestedIface);
if (n != null && n.satisfied(request.networkCapabilities)) { if (n != null && request.canBeSatisfiedBy(n.mCapabilities)) {
network = n; network = n;
} }
} else { } else {
for (NetworkInterfaceState n : mTrackingInterfaces.values()) { for (NetworkInterfaceState n : mTrackingInterfaces.values()) {
if (n.satisfied(request.networkCapabilities) && n.mLinkUp) { if (request.canBeSatisfiedBy(n.mCapabilities) && n.mLinkUp) {
network = n; network = n;
break; break;
} }