diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-16 15:38:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-16 15:38:00 +0000 |
| commit | d7a54c6574c3ca759e977f27912caecb6b40e827 (patch) | |
| tree | 92e64d833257c421237c1812dde1cad870e97fbd /core/java/android/os | |
| parent | 425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb (diff) | |
| parent | 31f10bb21b24824c5dbf60b420239513f02b9e55 (diff) | |
| download | frameworks_base-d7a54c6574c3ca759e977f27912caecb6b40e827.zip frameworks_base-d7a54c6574c3ca759e977f27912caecb6b40e827.tar.gz frameworks_base-d7a54c6574c3ca759e977f27912caecb6b40e827.tar.bz2 | |
am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '31f10bb21b24824c5dbf60b420239513f02b9e55':
AArch64: Use long for pointers in android/os/MemoryFile
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/MemoryFile.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/os/MemoryFile.java b/core/java/android/os/MemoryFile.java index e8148f7..ee7a4c6 100644 --- a/core/java/android/os/MemoryFile.java +++ b/core/java/android/os/MemoryFile.java @@ -43,19 +43,19 @@ public class MemoryFile private static native FileDescriptor native_open(String name, int length) throws IOException; // returns memory address for ashmem region - private static native int native_mmap(FileDescriptor fd, int length, int mode) + private static native long native_mmap(FileDescriptor fd, int length, int mode) throws IOException; - private static native void native_munmap(int addr, int length) throws IOException; + private static native void native_munmap(long addr, int length) throws IOException; private static native void native_close(FileDescriptor fd); - private static native int native_read(FileDescriptor fd, int address, byte[] buffer, + private static native int native_read(FileDescriptor fd, long address, byte[] buffer, int srcOffset, int destOffset, int count, boolean isUnpinned) throws IOException; - private static native void native_write(FileDescriptor fd, int address, byte[] buffer, + private static native void native_write(FileDescriptor fd, long 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_size(FileDescriptor fd) throws IOException; private FileDescriptor mFD; // ashmem file descriptor - private int mAddress; // address of ashmem memory + private long mAddress; // address of ashmem memory private int mLength; // total length of our ashmem region private boolean mAllowPurging = false; // true if our ashmem region is unpinned |