commit 497155645122fbfb96b5bd5898f5ea976332dbf3
author Patrick Rohr <prohr@google.com> Thu Jan 16 11:17:19 2025 -0800
committer Patrick Rohr <prohr@google.com> Thu Jan 16 13:04:42 2025 -0800
tree c75b5606c08b693a055249e6d210701e1ed92806
parent fbdead2f5dece9e604b7fed7911f64a94c1a3e34

Move TimerFdUtils JNI functionality into ServiceConnectivityJni

Test: build and boots
Change-Id: Idb9f8c9979aff43e6e5351d190329e823112e005

staticlibs/native/timerfdutils/Android.bp

diff --git a/staticlibs/native/timerfdutils/Android.bp b/staticlibs/native/timerfdutils/Android.bp
index 939a2d2..1f5542c 100644
--- a/staticlibs/native/timerfdutils/Android.bp
+++ b/staticlibs/native/timerfdutils/Android.bp
@@ -20,7 +20,7 @@
 cc_library_static {
     name: "libnet_utils_device_common_timerfdjni",
     srcs: [
-        "com_android_net_module_util_TimerFdUtils.cpp",
+        "com_android_net_module_util_ServiceConnectivityJni.cpp",
     ],
     header_libs: [
         "jni_headers",

staticlibs/native/timerfdutils/com_android_net_module_util_ServiceConnectivityJni.cpp

diff --git a/staticlibs/native/timerfdutils/com_android_net_module_util_TimerFdUtils.cpp b/staticlibs/native/timerfdutils/com_android_net_module_util_ServiceConnectivityJni.cpp
similarity index 84%
rename from staticlibs/native/timerfdutils/com_android_net_module_util_TimerFdUtils.cpp
rename to staticlibs/native/timerfdutils/com_android_net_module_util_ServiceConnectivityJni.cpp
index c4c960d..fdefd0e 100644
--- a/staticlibs/native/timerfdutils/com_android_net_module_util_TimerFdUtils.cpp
+++ b/staticlibs/native/timerfdutils/com_android_net_module_util_ServiceConnectivityJni.cpp
@@ -33,7 +33,7 @@
 namespace android {
 
 static jint
-com_android_net_module_util_TimerFdUtils_createTimerFd(JNIEnv *env,
+com_android_net_module_util_ServiceConnectivityJni_createTimerFd(JNIEnv *env,
                                                        jclass clazz) {
   int tfd;
   tfd = timerfd_create(CLOCK_BOOTTIME, 0);
@@ -44,7 +44,7 @@
 }
 
 static void
-com_android_net_module_util_TimerFdUtils_setTime(JNIEnv *env, jclass clazz,
+com_android_net_module_util_ServiceConnectivityJni_setTime(JNIEnv *env, jclass clazz,
                                                  jint tfd, jlong milliseconds) {
   struct itimerspec new_value;
   new_value.it_value.tv_sec = milliseconds / MSEC_PER_SEC;
@@ -66,12 +66,12 @@
 static const JNINativeMethod gMethods[] = {
     /* name, signature, funcPtr */
     {"createTimerFd", "()I",
-     (void *)com_android_net_module_util_TimerFdUtils_createTimerFd},
+     (void *)com_android_net_module_util_ServiceConnectivityJni_createTimerFd},
     {"setTime", "(IJ)V",
-     (void *)com_android_net_module_util_TimerFdUtils_setTime},
+     (void *)com_android_net_module_util_ServiceConnectivityJni_setTime},
 };
 
-int register_com_android_net_module_util_TimerFdUtils(JNIEnv *env,
+int register_com_android_net_module_util_ServiceConnectivityJni(JNIEnv *env,
                                                       char const *class_name) {
   return jniRegisterNativeMethods(env, class_name, gMethods, NELEM(gMethods));
 }