From a2b6ea189db491126465baa1fd31a61c28f5b6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 25 Apr 2023 07:43:38 +0000 Subject: [PATCH] only register jni for ClatCoordinator on T+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Clat was mainlined in Android T) Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: Ic30b89c809adc95606795bdd9309169559070c89 --- service/jni/onload.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/service/jni/onload.cpp b/service/jni/onload.cpp index 3d15d43db4..4bbaae67d7 100644 --- a/service/jni/onload.cpp +++ b/service/jni/onload.cpp @@ -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; }