Merge "Remove unused methods in InetAddress"
diff --git a/ojluni/src/main/java/java/net/InetAddress.java b/ojluni/src/main/java/java/net/InetAddress.java
index 94d32d3..c1afa54 100644
--- a/ojluni/src/main/java/java/net/InetAddress.java
+++ b/ojluni/src/main/java/java/net/InetAddress.java
@@ -1703,16 +1703,6 @@
return impl.lookupAllHostAddr(host, netId).clone();
}
// END Android-added: Add methods required by frameworks/base.
-
- // Only called by java.net.SocketPermission.
- static InetAddress[] getAllByName0(String authHost, boolean check) throws UnknownHostException {
- throw new UnsupportedOperationException();
- }
-
- // Only called by java.net.SocketPermission.
- String getHostName(boolean check) {
- throw new UnsupportedOperationException();
- }
}
// BEGIN Android-removed: Android doesn't load user-provided implementation.
/*