Merge "Test that Calendars can in fact be serialized."
diff --git a/Docs.mk b/Docs.mk
index 42eee45..8b5e469 100644
--- a/Docs.mk
+++ b/Docs.mk
@@ -15,9 +15,9 @@
#
# $(1): directory for search (to support use from frameworks/base)
define libcore_to_document
- $(call libcoredoc-all-java-files-under,$(1),
+ $(call libcoredoc-all-java-files-under,$(1), \
dalvik/src/main/java/dalvik/system/ -maxdepth 1) \
- $(call libcoredoc-all-java-files-under,$(1),
+ $(call libcoredoc-all-java-files-under,$(1), \
dalvik/src/main/java/dalvik/annotation \
dalvik/src/main/java/dalvik/bytecode \
json/src/main/java \
diff --git a/luni/src/main/java/java/net/Socket.java b/luni/src/main/java/java/net/Socket.java
index 9a2bd08..7661f28 100644
--- a/luni/src/main/java/java/net/Socket.java
+++ b/luni/src/main/java/java/net/Socket.java
@@ -965,7 +965,7 @@
/**
* @hide internal use only
*/
- public final FileDescriptor getFileDescriptor$() {
+ public FileDescriptor getFileDescriptor$() {
return impl.fd;
}
diff --git a/luni/src/main/java/java/nio/SocketChannelImpl.java b/luni/src/main/java/java/nio/SocketChannelImpl.java
index 996a4a7..f3da7c3 100644
--- a/luni/src/main/java/java/nio/SocketChannelImpl.java
+++ b/luni/src/main/java/java/nio/SocketChannelImpl.java
@@ -570,6 +570,11 @@
throw new SocketException("Socket is not connected");
}
}
+
+ @Override
+ public FileDescriptor getFileDescriptor$() {
+ return socketImpl.getFD$();
+ }
}
/*
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
index fcba9e9..0498ebc 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
@@ -18,6 +18,8 @@
import dalvik.system.BlockGuard;
import dalvik.system.CloseGuard;
+
+import java.io.FileDescriptor;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -984,4 +986,13 @@
super.finalize();
}
}
+
+ @Override
+ public FileDescriptor getFileDescriptor$() {
+ if (socket == this) {
+ return super.getFileDescriptor$();
+ } else {
+ return socket.getFileDescriptor$();
+ }
+ }
}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
index 2abc082..27bbead 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
@@ -17,6 +17,7 @@
package org.apache.harmony.xnet.provider.jsse;
+import java.io.FileDescriptor;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
@@ -219,6 +220,11 @@
return socket.getLocalPort();
}
+ @Override
+ public FileDescriptor getFileDescriptor$() {
+ return socket.getFileDescriptor$();
+ }
+
// -------------------------------------------------------------------
}