commit | 354041ceaf95564c4d3e2671a5b6facd500fac84 | [log] [tgz] |
---|---|---|
author | Maciej Żenczykowski <maze@google.com> | Fri May 31 08:05:30 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 31 08:05:30 2024 +0000 |
tree | 24a4fbb4e000ac2610b0547e2fafc526fc2aa211 | |
parent | 3460d431fa5d156c6a0da576feb9273b2e0ffaa4 [diff] | |
parent | d1a506817c578edf86130d37bf3c03a92241687c [diff] |
Merge "Treat APFv3 as APFv4 with not fully working counters." into main am: 0f6a857cf5 am: d1a506817c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3108061 Change-Id: Ie2ec1c4e784c5f24e95c589556f3283616233a50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/framework/src/android/net/apf/ApfCapabilities.java b/framework/src/android/net/apf/ApfCapabilities.java index 8efb182..6b18629 100644 --- a/framework/src/android/net/apf/ApfCapabilities.java +++ b/framework/src/android/net/apf/ApfCapabilities.java
@@ -112,12 +112,12 @@ /** * Determines whether the APF interpreter advertises support for the data buffer access opcodes * LDDW (LoaD Data Word) and STDW (STore Data Word). Full LDDW (LoaD Data Word) and - * STDW (STore Data Word) support is present from APFv4 on. + * STDW (STore Data Word) support is present from APFv3 on. * * @return {@code true} if the IWifiStaIface#readApfPacketFilterData is supported. */ public boolean hasDataAccess() { - return apfVersionSupported >= 4; + return apfVersionSupported > 2; } /**