Merge "NetworkInterface: Clarify change marker." am: b338fcfdd8
Change-Id: Idbd349eb8dcd739cb648b32bc52c71cbd979a628
diff --git a/ojluni/src/main/java/java/net/NetworkInterface.java b/ojluni/src/main/java/java/net/NetworkInterface.java
index 673a1d2..fec6e55 100644
--- a/ojluni/src/main/java/java/net/NetworkInterface.java
+++ b/ojluni/src/main/java/java/net/NetworkInterface.java
@@ -378,12 +378,30 @@
public static Enumeration<NetworkInterface> getNetworkInterfaces()
throws SocketException {
final NetworkInterface[] netifs = getAll();
-
// Android-changed: Rewrote NetworkInterface on top of Libcore.io.
- // specified to return null if no network interfaces
+ // // specified to return null if no network interfaces
+ // if (netifs == null)
if (netifs.length == 0)
return null;
+ // Android-changed: Rewrote NetworkInterface on top of Libcore.io.
+ /*
+ return new Enumeration<NetworkInterface>() {
+ private int i = 0;
+ public NetworkInterface nextElement() {
+ if (netifs != null && i < netifs.length) {
+ NetworkInterface netif = netifs[i++];
+ return netif;
+ } else {
+ throw new NoSuchElementException();
+ }
+ }
+
+ public boolean hasMoreElements() {
+ return (netifs != null && i < netifs.length);
+ }
+ };
+ */
return Collections.enumeration(Arrays.asList(netifs));
}