Snap for 6792403 from 57da3c822d6994ed2da78cee9e2530ce263c2c75 to rvc-d2-release
Change-Id: I18b5afd82a93e6c7f451ed6d3a5f026c10e1bde5
diff --git a/luni/src/test/java/libcore/java/io/RandomAccessFileTest.java b/luni/src/test/java/libcore/java/io/RandomAccessFileTest.java
index 3811cbc..eab558a 100644
--- a/luni/src/test/java/libcore/java/io/RandomAccessFileTest.java
+++ b/luni/src/test/java/libcore/java/io/RandomAccessFileTest.java
@@ -41,16 +41,6 @@
file.delete();
}
- public void testSeekTooLarge() throws Exception {
- try (RandomAccessFile raf = new RandomAccessFile(file, "rw")) {
- try {
- raf.seek(Long.MAX_VALUE);
- fail();
- } catch (IOException expected) {
- }
- }
- }
-
public void testSetLengthTooLarge() throws Exception {
try (RandomAccessFile raf = new RandomAccessFile(file, "rw")) {
try {
diff --git a/ojluni/src/main/native/zip_util.c b/ojluni/src/main/native/zip_util.c
index 6c02d2b..aa9c5ce 100644
--- a/ojluni/src/main/native/zip_util.c
+++ b/ojluni/src/main/native/zip_util.c
@@ -156,7 +156,7 @@
* JVM_IO_INTR is tricky and could cause undesired side effect. So we decided
* to simply call "read" on Solaris/Linux. See details in bug 6304463.
*/
- return pread(zfd, buf, nbytes, offset);
+ return pread64(zfd, buf, nbytes, offset);
#endif
}