LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BpfNetMaps: do not register BpfNetMaps JNI before T

Browse Source 
BpfNetMaps needs to go through netd before T and must *never* use the
JNI methods. BpfNetMaps already throws if this code path is called
before T.

Test: TH
Change-Id: I5f69c3673cfe86ef02f9b8e35a1db63f39c3da7e
This commit is contained in:
Patrick Rohr
2023-05-02 16:17:53 +00:00
parent f69ae23e01
commit 31edd95c24
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/jni/onload.cpp
View File

@@ -38,11 +38,11 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
return JNI_ERR; return JNI_ERR;
} }
if (android::modules::sdklevel::IsAtLeastT()) {
if (register_com_android_server_BpfNetMaps(env) < 0) { if (register_com_android_server_BpfNetMaps(env) < 0) {
return JNI_ERR; return JNI_ERR;
} }
if (android::modules::sdklevel::IsAtLeastT()) {
if (register_com_android_server_connectivity_ClatCoordinator(env) < 0) { if (register_com_android_server_connectivity_ClatCoordinator(env) < 0) {
return JNI_ERR; return JNI_ERR;
} }