commit 1b311972abc321dde11e880e040c180391d07d90
author Yuyang Huang <yuyanghuang@google.com> Sat Mar 30 09:01:58 2024 +0900
committer Yuyang Huang <yuyanghuang@google.com> Sat Mar 30 09:01:58 2024 +0900
tree f6150711dda3a4c614c940c19fcbc639bdc02309
parent 5b7b05a6cb44975364d57650b055be2bec4957b5

Enable APFv6 support in ApfConfiguration

Added configuration options to ApfConfiguration to allow the use of
APFv6

Test: TH
Change-Id: Id2b80991500cabc8fea8808d3d59b427051cf6c7

src/android/net/apf/ApfFilter.java

diff --git a/src/android/net/apf/ApfFilter.java b/src/android/net/apf/ApfFilter.java
index dbda0ce..117ed13 100644
--- a/src/android/net/apf/ApfFilter.java
+++ b/src/android/net/apf/ApfFilter.java
@@ -170,6 +170,7 @@
         public int acceptRaMinLft;
         public boolean shouldHandleLightDoze;
         public long minMetricsSessionDurationMs;
+        public boolean enableApfV6;
     }
 
     /** A wrapper class of {@link SystemClock} to be mocked in unit tests. */
@@ -281,6 +282,7 @@
     private final int mAcceptRaMinLft;
     private final boolean mShouldHandleLightDoze;
 
+    private final boolean mEnableApfV6;
     private final NetworkQuirkMetrics mNetworkQuirkMetrics;
     private final IpClientRaInfoMetrics mIpClientRaInfoMetrics;
     private final ApfSessionInfoMetrics mApfSessionInfoMetrics;
@@ -378,6 +380,7 @@
         mClock = clock;
         mSessionStartMs = mClock.elapsedRealtime();
         mMinMetricsSessionDurationMs = config.minMetricsSessionDurationMs;
+        mEnableApfV6 = config.enableApfV6;
 
         if (mApfCapabilities.hasDataAccess()) {
             mCountAndPassLabel = "countAndPass";