diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2013-12-17 19:04:19 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-01-07 12:52:57 +0000 |
| commit | e2e59326f13cf291bf5b37989390fd2a55a94f0c (patch) | |
| tree | 10e48409726a6d4f96d5e48b619a57a0c0870fa3 /media/java | |
| parent | 9bc6acf27ac446b7e18a51a926caafd99cf34713 (diff) | |
| download | frameworks_base-e2e59326f13cf291bf5b37989390fd2a55a94f0c.zip frameworks_base-e2e59326f13cf291bf5b37989390fd2a55a94f0c.tar.gz frameworks_base-e2e59326f13cf291bf5b37989390fd2a55a94f0c.tar.bz2 | |
AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Diffstat (limited to 'media/java')
| -rwxr-xr-x | media/java/android/mtp/MtpDatabase.java | 2 | ||||
| -rw-r--r-- | media/java/android/mtp/MtpDevice.java | 2 | ||||
| -rw-r--r-- | media/java/android/mtp/MtpServer.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java index cf1238a..9ceefc3 100755 --- a/media/java/android/mtp/MtpDatabase.java +++ b/media/java/android/mtp/MtpDatabase.java @@ -1036,7 +1036,7 @@ public class MtpDatabase { } // used by the JNI code - private int mNativeContext; + private long mNativeContext; private native final void native_setup(); private native final void native_finalize(); diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java index 3272fed..8310579 100644 --- a/media/java/android/mtp/MtpDevice.java +++ b/media/java/android/mtp/MtpDevice.java @@ -237,7 +237,7 @@ public final class MtpDevice { } // used by the JNI code - private int mNativeContext; + private long mNativeContext; private native boolean native_open(String deviceName, int fd); private native void native_close(); diff --git a/media/java/android/mtp/MtpServer.java b/media/java/android/mtp/MtpServer.java index f561cc0..266f78e 100644 --- a/media/java/android/mtp/MtpServer.java +++ b/media/java/android/mtp/MtpServer.java @@ -22,7 +22,7 @@ package android.mtp; */ public class MtpServer implements Runnable { - private int mNativeContext; // accessed by native methods + private long mNativeContext; // accessed by native methods static { System.loadLibrary("media_jni"); |