commit e1160af2ea30d42d6fabf2f987c1f634c0d31ba8
author Elliott Hughes <enh@google.com> Fri Mar 22 09:27:23 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 22 09:27:23 2013 -0700
tree 0a910a7192213266c782922bc8914db5c3aaf4b4
parent dc90f9ba66cf93d99c8357b8e76145bfaf07f84d
parent 8223a7f0c4dd1119d05199f48fe70d854cd8b558

am 8223a7f0: am ee41b1df: Merge "Fix libcore translation of AF_UNSPEC InetAddress instances."

* commit '8223a7f0c4dd1119d05199f48fe70d854cd8b558':
  Fix libcore translation of AF_UNSPEC InetAddress instances.

luni/src/main/native/NetworkUtilities.cpp

diff --git a/luni/src/main/native/NetworkUtilities.cpp b/luni/src/main/native/NetworkUtilities.cpp
index de07201..7215306 100644
--- a/luni/src/main/native/NetworkUtilities.cpp
+++ b/luni/src/main/native/NetworkUtilities.cpp
@@ -113,6 +113,7 @@
     static jfieldID familyFid = env->GetFieldID(JniConstants::inetAddressClass, "family", "I");
     ss.ss_family = env->GetIntField(inetAddress, familyFid);
     if (ss.ss_family == AF_UNSPEC) {
+        sa_len = sizeof(ss.ss_family);
         return true; // Job done!
     }