LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix InetAddressCompat exception handling" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-19 16:14:10 +00:00
committed by Android (Google) Code Review
parent 4132a57683 57707a50da
commit a9a0b49bbc
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
framework/src/android/net/InetAddressCompat.java
View File

@@ -41,7 +41,12 @@ public class InetAddressCompat {
public static void clearDnsCache() {
try {
InetAddress.class.getMethod("clearDnsCache").invoke(null);
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
} catch (InvocationTargetException e) {
if (e.getCause() instanceof RuntimeException) {
throw (RuntimeException) e.getCause();
}
throw new IllegalStateException("Unknown InvocationTargetException", e.getCause());
} catch (IllegalAccessException | NoSuchMethodException e) {
Log.wtf(InetAddressCompat.class.getSimpleName(), "Error clearing DNS cache", e);
}
}
@@ -51,13 +56,7 @@ public class InetAddressCompat {
*/
public static InetAddress[] getAllByNameOnNet(String host, int netId) throws
UnknownHostException {
try {
return (InetAddress[]) InetAddress.class.getMethod("getAllByNameOnNet",
String.class, int.class).invoke(null, host, netId);
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
Log.wtf(InetAddressCompat.class.getSimpleName(), "Error calling getAllByNameOnNet", e);
throw new IllegalStateException("Error querying via getAllNameOnNet", e);
}
return (InetAddress[]) callGetByNameMethod("getAllByNameOnNet", host, netId);
}
/**
@@ -65,12 +64,25 @@ public class InetAddressCompat {
*/
public static InetAddress getByNameOnNet(String host, int netId) throws
UnknownHostException {
return (InetAddress) callGetByNameMethod("getByNameOnNet", host, netId);
}
private static Object callGetByNameMethod(String method, String host, int netId)
throws UnknownHostException {
try {
return (InetAddress) InetAddress.class.getMethod("getByNameOnNet",
String.class, int.class).invoke(null, host, netId);
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
Log.wtf(InetAddressCompat.class.getSimpleName(), "Error calling getAllByNameOnNet", e);
throw new IllegalStateException("Error querying via getByNameOnNet", e);
return InetAddress.class.getMethod(method, String.class, int.class)
.invoke(null, host, netId);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof UnknownHostException) {
throw (UnknownHostException) e.getCause();
}
if (e.getCause() instanceof RuntimeException) {
throw (RuntimeException) e.getCause();
}
throw new IllegalStateException("Unknown InvocationTargetException", e.getCause());
} catch (IllegalAccessException | NoSuchMethodException e) {
Log.wtf(InetAddressCompat.class.getSimpleName(), "Error calling " + method, e);
throw new IllegalStateException("Error querying via " + method, e);
}
}
}