Merge "only register jni for ClatCoordinator on T+"
This commit is contained in:
commit
e99a22d405
1 changed files with 5 additions and 5 deletions
|
|
@ -22,8 +22,8 @@
|
|||
namespace android {
|
||||
|
||||
int register_com_android_server_TestNetworkService(JNIEnv* env);
|
||||
int register_com_android_server_connectivity_ClatCoordinator(JNIEnv* env);
|
||||
int register_com_android_server_BpfNetMaps(JNIEnv* env);
|
||||
int register_com_android_server_connectivity_ClatCoordinator(JNIEnv* env);
|
||||
int register_android_server_net_NetworkStatsFactory(JNIEnv* env);
|
||||
int register_android_server_net_NetworkStatsService(JNIEnv* env);
|
||||
|
||||
|
|
@ -38,15 +38,15 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
|
|||
return JNI_ERR;
|
||||
}
|
||||
|
||||
if (register_com_android_server_connectivity_ClatCoordinator(env) < 0) {
|
||||
return JNI_ERR;
|
||||
}
|
||||
|
||||
if (register_com_android_server_BpfNetMaps(env) < 0) {
|
||||
return JNI_ERR;
|
||||
}
|
||||
|
||||
if (android::modules::sdklevel::IsAtLeastT()) {
|
||||
if (register_com_android_server_connectivity_ClatCoordinator(env) < 0) {
|
||||
return JNI_ERR;
|
||||
}
|
||||
|
||||
if (register_android_server_net_NetworkStatsFactory(env) < 0) {
|
||||
return JNI_ERR;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue