Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9fc2e9c9: MemoryFile constructor and native methods throw IOExceptions.

Browse Source 
Merge commit '9fc2e9c965c68d56a0caf812f7f6d38d15317063'

* commit '9fc2e9c965c68d56a0caf812f7f6d38d15317063':
  MemoryFile constructor and native methods throw IOExceptions.
This commit is contained in:
Bjorn Bringert
2009-05-29 01:12:09 -07:00
committed by The Android Open Source Project
parent a38201d8f5 9fc2e9c965
commit 0c66b4bcfb
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.xml
View File

@@ -96978,6 +96978,8 @@
</parameter>
<parameter name="length" type="int">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</constructor>
<method name="allowPurging"
return="boolean"

19
core/java/android/os/MemoryFile.java
View File

@@ -37,15 +37,15 @@ public class MemoryFile
private static String TAG = "MemoryFile";
// returns fd
private native int native_open(String name, int length);
private static native int native_open(String name, int length) throws IOException;
// returns memory address for ashmem region
private native int native_mmap(int fd, int length);
private native void native_close(int fd);
private native int native_read(int fd, int address, byte[] buffer,
int srcOffset, int destOffset, int count, boolean isUnpinned);
private native void native_write(int fd, int address, byte[] buffer,
int srcOffset, int destOffset, int count, boolean isUnpinned);
private native void native_pin(int fd, boolean pin);
private static native int native_mmap(int fd, int length) throws IOException;
private static native void native_close(int fd);
private static native int native_read(int fd, int address, byte[] buffer,
int srcOffset, int destOffset, int count, boolean isUnpinned) throws IOException;
private static native void native_write(int fd, int address, byte[] buffer,
int srcOffset, int destOffset, int count, boolean isUnpinned) throws IOException;
private static native void native_pin(int fd, boolean pin) throws IOException;
private int mFD; // ashmem file descriptor
private int mAddress; // address of ashmem memory
@@ -57,8 +57,9 @@ public class MemoryFile
*
* @param name optional name for the file (can be null).
* @param length of the memory file in bytes.
* @throws IOException if the memory file could not be created.
*/
public MemoryFile(String name, int length) {
public MemoryFile(String name, int length) throws IOException {
mLength = length;
mFD = native_open(name, length);
mAddress = native_mmap(mFD, length);