drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't round size to page size. Ashmem will do this internally as needed."

Browse Source
This commit is contained in:
Marco Nelissen
2010-01-04 10:31:28 -08:00
committed by Android (Google) Code Review
parent e38d58bf89 7bcbd51173
commit e80a066984
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class MemoryFile
private static native void native_write(FileDescriptor fd, int address, byte[] buffer,
int srcOffset, int destOffset, int count, boolean isUnpinned) throws IOException;
private static native void native_pin(FileDescriptor fd, boolean pin) throws IOException;
private static native int native_get_mapped_size(FileDescriptor fd) throws IOException;
private static native int native_get_size(FileDescriptor fd) throws IOException;
private FileDescriptor mFD; // ashmem file descriptor
private int mAddress; // address of ashmem memory
@ -300,20 +300,19 @@ public class MemoryFile
* @hide
*/
public static boolean isMemoryFile(FileDescriptor fd) throws IOException {
return (native_get_mapped_size(fd) >= 0);
return (native_get_size(fd) >= 0);
}
/**
* Returns the size of the memory file, rounded up to a page boundary, that
* the file descriptor refers to, or -1 if the file descriptor does not
* refer to a memory file.
* Returns the size of the memory file that the file descriptor refers to,
* or -1 if the file descriptor does not refer to a memory file.
*
* @throws IOException If <code>fd</code> is not a valid file descriptor.
*
* @hide
*/
public static int getMappedSize(FileDescriptor fd) throws IOException {
return native_get_mapped_size(fd);
public static int getSize(FileDescriptor fd) throws IOException {
return native_get_size(fd);
}
/**