joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Use ErrnoException for handling exceptions in JNI functions" into main

Browse source
This commit is contained in:
Patrick Rohr 2025-02-12 08:34:43 -08:00 • committed by Gerrit Code Review
commit 0cf79aa0ed
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
View file

@ -17,8 +17,7 @@
package com.android.net.module.util;
import android.annotation.NonNull;
import java.io.IOException;
import android.system.ErrnoException;
/**
* Contains JNI functions for use in service-connectivity
@ -38,17 +37,17 @@ public class ServiceConnectivityJni {
/**
* Create a timerfd.
*
* @throws IOException if the timerfd creation is failed.
* @throws ErrnoException if the timerfd creation is failed.
*/
public static native int createTimerFd() throws IOException;
public static native int createTimerFd() throws ErrnoException;
/**
* Set given time to the timerfd.
*
* @param timeMs target time
* @throws IOException if setting expiration time is failed.
* @throws ErrnoException if setting expiration time is failed.
*/
public static native void setTimerFdTime(int fd, long timeMs) throws IOException;
public static native void setTimerFdTime(int fd, long timeMs) throws ErrnoException;
/** Create tun/tap interface */
public static native int createTunTap(boolean isTun, boolean hasCarrier,

8
staticlibs/device/com/android/net/module/util/TimerFdUtils.java
View file

@ -16,11 +16,9 @@
package com.android.net.module.util;
import android.os.Process;
import android.system.ErrnoException;
import android.util.Log;
import java.io.IOException;
/**
* Contains mostly timerfd functionality.
*/
@ -33,7 +31,7 @@ public class TimerFdUtils {
static int createTimerFileDescriptor() {
try {
return ServiceConnectivityJni.createTimerFd();
} catch (IOException e) {
} catch (ErrnoException e) {
Log.e(TAG, "createTimerFd failed", e);
return -1;
}
@ -45,7 +43,7 @@ public class TimerFdUtils {
static boolean setExpirationTime(int fd, long expirationTimeMs) {
try {
ServiceConnectivityJni.setTimerFdTime(fd, expirationTimeMs);
} catch (IOException e) {
} catch (ErrnoException e) {
Log.e(TAG, "setExpirationTime failed", e);
return false;
}