Merge "clatd bpf: drop multicast" into main
diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index bdc2e8c..74c37c4 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1832,7 +1832,9 @@
int v = fscanf(f, "# %d %d %d %d %d #", &y, &q, &a, &b, &c);
ALOGI("detected %d of 5: %dQ%d api:%d.%d.%d", v, y, q, a, b, c);
fclose(f);
- if (v != 5 || y != 2025 || q != 2 || a != 36 || b || c) return 1;
+ if (v != 5 || y != 2025 || a != 36 || b) return 1;
+ if (q < 2 || q > 3) return 1;
+ if (c < 0 || c > 1) return 1;
}
// Ensure we can determine the Android build type.
diff --git a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
index eac4c25..5d83f72 100644
--- a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
+++ b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -166,17 +166,6 @@
});
}
- private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearDefaults) {
- final NetworkCapabilities.Builder builder =
- clearDefaults
- ? NetworkCapabilities.Builder.withoutDefaultCapabilities()
- : new NetworkCapabilities.Builder();
- return builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)
- .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED)
- .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
- }
-
-
@Test
public void testNetworkCapabilityParsing() {
final NetworkCapabilities baseNc = NetworkCapabilities.Builder.withoutDefaultCapabilities()
