commit d527cf1f993f43d23c0cc171d46849c6e427c493
author Josh Gao <jmgao@google.com> Fri Sep 07 12:46:02 2018 -0700
committer Josh Gao <jmgao@google.com> Mon Sep 17 17:31:58 2018 -0700
tree f15e7e05ac4716845f56849b9ec4923421699f9e
parent 431d2ff1418cf94c36437f35b1f55b81e2e1d976

fdsan: add types for Java sockets.

Test: art/tools/run-libcore-tests.sh
Change-Id: If61211bc4ae225c3f89db989a167f9dc4fce375a

libc/bionic/fdsan.cpp

diff --git a/libc/bionic/fdsan.cpp b/libc/bionic/fdsan.cpp
index 31ffa96..1cbe6d9 100644
--- a/libc/bionic/fdsan.cpp
+++ b/libc/bionic/fdsan.cpp
@@ -249,6 +249,10 @@
       return "sqlite";
     case ANDROID_FDSAN_OWNER_TYPE_ART_FDFILE:
       return "ART FdFile";
+    case ANDROID_FDSAN_OWNER_TYPE_DATAGRAMSOCKETIMPL:
+      return "DatagramSocketImpl";
+    case ANDROID_FDSAN_OWNER_TYPE_SOCKETIMPL:
+      return "SocketImpl";
 
     case ANDROID_FDSAN_OWNER_TYPE_GENERIC_00:
     default:

libc/include/android/fdsan.h

diff --git a/libc/include/android/fdsan.h b/libc/include/android/fdsan.h
index dc2bbd5..d390c6e 100644
--- a/libc/include/android/fdsan.h
+++ b/libc/include/android/fdsan.h
@@ -114,6 +114,12 @@
 
   /* ART FdFile */
   ANDROID_FDSAN_OWNER_TYPE_ART_FDFILE = 9,
+
+  /* java.net.DatagramSocketImpl */
+  ANDROID_FDSAN_OWNER_TYPE_DATAGRAMSOCKETIMPL = 10,
+
+  /* java.net.SocketImpl */
+  ANDROID_FDSAN_OWNER_TYPE_SOCKETIMPL = 11,
 };
 
 /*