| commit | dc3d075dadfecf920c18f82101ea4312564229d2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue May 02 20:11:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 02 20:11:14 2023 +0000 |
| tree | d19b3633c3cb024cc31623daeced891511069fb0 | |
| parent | 00e4ba9679dde43ce65814552c3213161c7a774e [diff] | |
| parent | 41ab1ebbc9e7b2a31981e2625ba3953066b1096c [diff] |
Merge "BpfNetMaps: do not register BpfNetMaps JNI before T" am: 277b236de3 am: 41ab1ebbc9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2576150 Change-Id: I028d4be1ed9c51b42545e0a9f019b7eca717d288 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/jni/onload.cpp b/service/jni/onload.cpp index 4bbaae6..ed74430 100644 --- a/service/jni/onload.cpp +++ b/service/jni/onload.cpp
@@ -38,11 +38,11 @@ return JNI_ERR; } - if (register_com_android_server_BpfNetMaps(env) < 0) { - return JNI_ERR; - } - if (android::modules::sdklevel::IsAtLeastT()) { + if (register_com_android_server_BpfNetMaps(env) < 0) { + return JNI_ERR; + } + if (register_com_android_server_connectivity_ClatCoordinator(env) < 0) { return JNI_ERR; }