Delete Ra.seenCount
seenCount was only used for debugging, though I am unsure about its
actual usefulness. Removing it makes Ra immutable.
Test: atest ApfV4Test
Change-Id: I7f21733a47d4f24189f444af718040d7a2fd9b87
diff --git a/src/android/net/apf/ApfFilter.java b/src/android/net/apf/ApfFilter.java
index a91fce5..c47e95e 100644
--- a/src/android/net/apf/ApfFilter.java
+++ b/src/android/net/apf/ApfFilter.java
@@ -657,9 +657,6 @@
// For debugging only. Offsets into the packet where RIO options are.
private final ArrayList<Integer> mRioOptionOffsets = new ArrayList<>();
- // For debugging only. How many times this RA was seen.
- int seenCount = 1;
-
// For debugging only. Returns the hex representation of the last matching packet.
String getLastMatchingPacket() {
return HexDump.toHexString(mPacket.array(), 0, mPacket.capacity(),
@@ -2084,9 +2081,6 @@
final Ra oldRa = mRas.get(i);
final Ra.MatchType result = oldRa.matches(ra);
if (result == Ra.MatchType.MATCH_PASS) {
- // Only update RA seenCount (or anything related to the RA for a MATCH_PASS, so
- // behavior is independent of APF program state.
- ra.seenCount += oldRa.seenCount;
log("Updating RA from " + oldRa + " to " + ra);
// Keep mRas in LRU order so as to prioritize generating filters for recently seen
@@ -2327,7 +2321,7 @@
pw.println(ra);
pw.increaseIndent();
pw.println(String.format(
- "Seen: %d, last %ds ago", ra.seenCount, secondsSinceBoot() - ra.mLastSeen));
+ "Last seen %ds ago", secondsSinceBoot() - ra.mLastSeen));
if (DBG) {
pw.println("Last match:");
pw.increaseIndent();
