Merge changes I47b6011d,I5da28a6d into main
* changes:
Rename timerfd functions for consistency
Remove native prefix for consistency
diff --git a/service/src/com/android/server/TestNetworkService.java b/service/src/com/android/server/TestNetworkService.java
index 7a422f7..96f4e20 100644
--- a/service/src/com/android/server/TestNetworkService.java
+++ b/service/src/com/android/server/TestNetworkService.java
@@ -135,7 +135,7 @@
// flags atomically.
final boolean setIffMulticast = bringUp;
ParcelFileDescriptor tunIntf = ParcelFileDescriptor.adoptFd(
- ServiceConnectivityJni.nativeCreateTunTap(
+ ServiceConnectivityJni.createTunTap(
isTun, hasCarrier, setIffMulticast, interfaceName));
// Disable DAD and remove router_solicitation_delay before assigning link addresses.
@@ -153,7 +153,7 @@
}
if (bringUp) {
- ServiceConnectivityJni.nativeBringUpInterface(interfaceName);
+ ServiceConnectivityJni.bringUpInterface(interfaceName);
}
return new TestNetworkInterface(tunIntf, interfaceName);
@@ -396,11 +396,11 @@
@Override
public void setCarrierEnabled(@NonNull TestNetworkInterface iface, boolean enabled) {
enforceTestNetworkPermissions(mContext);
- ServiceConnectivityJni.nativeSetTunTapCarrierEnabled(iface.getInterfaceName(),
+ ServiceConnectivityJni.setTunTapCarrierEnabled(iface.getInterfaceName(),
iface.getFileDescriptor().getFd(), enabled);
// Explicitly close fd after use to prevent StrictMode from complaining.
// Also, explicitly referencing iface guarantees that the object is not garbage collected
- // before nativeSetTunTapCarrierEnabled() executes.
+ // before setTunTapCarrierEnabled() executes.
try {
iface.getFileDescriptor().close();
} catch (IOException e) {
diff --git a/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java b/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
index 3aaccaf..4a5dd4f 100644
--- a/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
+++ b/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
@@ -48,16 +48,16 @@
* @param timeMs target time
* @throws IOException if setting expiration time is failed.
*/
- public static native void setTime(int fd, long timeMs) throws IOException;
+ public static native void setTimerFdTime(int fd, long timeMs) throws IOException;
/** Create tun/tap interface */
- public static native int nativeCreateTunTap(boolean isTun, boolean hasCarrier,
+ public static native int createTunTap(boolean isTun, boolean hasCarrier,
boolean setIffMulticast, @NonNull String iface);
/** Enable carrier on tun/tap interface */
- public static native void nativeSetTunTapCarrierEnabled(@NonNull String iface, int tunFd,
+ public static native void setTunTapCarrierEnabled(@NonNull String iface, int tunFd,
boolean enabled);
/** Bring up tun/tap interface */
- public static native void nativeBringUpInterface(String iface);
+ public static native void bringUpInterface(String iface);
}
diff --git a/staticlibs/device/com/android/net/module/util/TimerFdUtils.java b/staticlibs/device/com/android/net/module/util/TimerFdUtils.java
index aff75f4..10bc595 100644
--- a/staticlibs/device/com/android/net/module/util/TimerFdUtils.java
+++ b/staticlibs/device/com/android/net/module/util/TimerFdUtils.java
@@ -44,7 +44,7 @@
*/
static boolean setExpirationTime(int fd, long expirationTimeMs) {
try {
- ServiceConnectivityJni.setTime(fd, expirationTimeMs);
+ ServiceConnectivityJni.setTimerFdTime(fd, expirationTimeMs);
} catch (IOException e) {
Log.e(TAG, "setExpirationTime failed", e);
return false;
diff --git a/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp b/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
index 150f84e..365057a 100644
--- a/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
+++ b/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
@@ -51,9 +51,7 @@
namespace android {
-static jint
-com_android_net_module_util_ServiceConnectivityJni_createTimerFd(JNIEnv *env,
- jclass clazz) {
+static jint createTimerFd(JNIEnv *env, jclass clazz) {
int tfd;
tfd = timerfd_create(CLOCK_BOOTTIME, 0);
if (tfd == -1) {
@@ -62,9 +60,7 @@
return tfd;
}
-static void
-com_android_net_module_util_ServiceConnectivityJni_setTime(JNIEnv *env, jclass clazz,
- jint tfd, jlong milliseconds) {
+static void setTimerFdTime(JNIEnv *env, jclass clazz, jint tfd, jlong milliseconds) {
struct itimerspec new_value;
new_value.it_value.tv_sec = milliseconds / MSEC_PER_SEC;
new_value.it_value.tv_nsec = (milliseconds % MSEC_PER_SEC) * NSEC_PER_MSEC;
@@ -75,7 +71,7 @@
int ret = timerfd_settime(tfd, 0, &new_value, NULL);
if (ret == -1) {
- jniThrowErrnoException(env, "setTime", ret);
+ jniThrowErrnoException(env, "setTimerFdTime", ret);
}
}
@@ -185,13 +181,11 @@
*/
static const JNINativeMethod gMethods[] = {
/* name, signature, funcPtr */
- {"createTimerFd", "()I",
- (void *)com_android_net_module_util_ServiceConnectivityJni_createTimerFd},
- {"setTime", "(IJ)V",
- (void *)com_android_net_module_util_ServiceConnectivityJni_setTime},
- {"nativeSetTunTapCarrierEnabled", "(Ljava/lang/String;IZ)V", (void*)setTunTapCarrierEnabled},
- {"nativeCreateTunTap", "(ZZZLjava/lang/String;)I", (void*)createTunTap},
- {"nativeBringUpInterface", "(Ljava/lang/String;)V", (void*)bringUpInterface},
+ {"createTimerFd", "()I", (void *)createTimerFd},
+ {"setTimerFdTime", "(IJ)V", (void *)setTimerFdTime},
+ {"setTunTapCarrierEnabled", "(Ljava/lang/String;IZ)V", (void*)setTunTapCarrierEnabled},
+ {"createTunTap", "(ZZZLjava/lang/String;)I", (void*)createTunTap},
+ {"bringUpInterface", "(Ljava/lang/String;)V", (void*)bringUpInterface},
};
int register_com_android_net_module_util_ServiceConnectivityJni(JNIEnv *env,