Merge "Remove spurious long to int type casting in ApfFilter.java" into main
diff --git a/src/android/net/apf/ApfFilter.java b/src/android/net/apf/ApfFilter.java
index 88080e4..5fe19fd 100644
--- a/src/android/net/apf/ApfFilter.java
+++ b/src/android/net/apf/ApfFilter.java
@@ -1054,10 +1054,10 @@
//
// if lft < (oldLft + 2) // 3 -> PASS
// if lft > oldLft -> PASS
- // gen.addJumpIfR0LessThan((int) ((section.lifetime + 2) / 3),
+ // gen.addJumpIfR0LessThan(((section.lifetime + 2) / 3),
// nextFilterLabel);
if (lft < (section.lifetime + 2) / 3) return MatchType.MATCH_PASS;
- // gen.addJumpIfR0GreaterThan((int) section.lifetime, nextFilterLabel);
+ // gen.addJumpIfR0GreaterThan(section.lifetime, nextFilterLabel);
if (lft > section.lifetime) return MatchType.MATCH_PASS;
} else if (section.lifetime < section.min) {
// Case 2a) 0 < old lft < min
@@ -1081,7 +1081,7 @@
// if lft > oldLft -> PASS
// gen.addJumpIfR0Equals(0, nextFilterLabel);
if (lft == 0) return MatchType.MATCH_PASS;
- // gen.addJumpIfR0GreaterThan((int) section.lifetime, nextFilterLabel);
+ // gen.addJumpIfR0GreaterThan(section.lifetime, nextFilterLabel);
if (lft > section.lifetime) return MatchType.MATCH_PASS;
} else {
// Case 4a) otherwise
@@ -1094,10 +1094,10 @@
if (lft == 0) return MatchType.MATCH_PASS;
// gen.addJumpIfR0LessThan(section.min, continueLabel);
if (lft < section.min) continue;
- // gen.addJumpIfR0LessThan((int) ((section.lifetime + 2) / 3),
+ // gen.addJumpIfR0LessThan(((section.lifetime + 2) / 3),
// nextFilterLabel);
if (lft < (section.lifetime + 2) / 3) return MatchType.MATCH_PASS;
- // gen.addJumpIfR0GreaterThan((int) section.lifetime, nextFilterLabel);
+ // gen.addJumpIfR0GreaterThan(section.lifetime, nextFilterLabel);
if (lft > section.lifetime) return MatchType.MATCH_PASS;
}
}
@@ -1182,9 +1182,9 @@
//
// if lft < (oldLft + 2) // 3 -> PASS
// if lft > oldLft -> PASS
- gen.addJumpIfR0LessThan((int) ((section.lifetime + 2) / 3),
+ gen.addJumpIfR0LessThan(((section.lifetime + 2) / 3),
nextFilterLabel);
- gen.addJumpIfR0GreaterThan((int) section.lifetime, nextFilterLabel);
+ gen.addJumpIfR0GreaterThan(section.lifetime, nextFilterLabel);
} else if (section.lifetime < section.min) {
// Case 2a) 0 < old lft < min
//
@@ -1204,7 +1204,7 @@
// if lft == 0 -> PASS
// if lft > oldLft -> PASS
gen.addJumpIfR0Equals(0, nextFilterLabel);
- gen.addJumpIfR0GreaterThan((int) section.lifetime, nextFilterLabel);
+ gen.addJumpIfR0GreaterThan(section.lifetime, nextFilterLabel);
} else {
final String continueLabel = "Continue" + getUniqueNumberLocked();
// Case 4a) otherwise
@@ -1215,9 +1215,9 @@
// if lft > oldLft -> PASS
gen.addJumpIfR0Equals(0, nextFilterLabel);
gen.addJumpIfR0LessThan(section.min, continueLabel);
- gen.addJumpIfR0LessThan((int) ((section.lifetime + 2) / 3),
+ gen.addJumpIfR0LessThan(((section.lifetime + 2) / 3),
nextFilterLabel);
- gen.addJumpIfR0GreaterThan((int) section.lifetime, nextFilterLabel);
+ gen.addJumpIfR0GreaterThan(section.lifetime, nextFilterLabel);
// CONTINUE
gen.defineLabel(continueLabel);
