diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-07 13:10:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 13:10:19 +0000 |
| commit | c975437ef3338ba38b76b1a07594ccfd6e089709 (patch) | |
| tree | be423a8336081402b161deba8bc78bfcbc84a74d /media/java/android/mtp/MtpDevice.java | |
| parent | 819f2e12347e588c223923a3698daafb1c593ccf (diff) | |
| parent | 1e3395c7378a7dd293a2e8a8ac8fbf239adbad0c (diff) | |
am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '1e3395c7378a7dd293a2e8a8ac8fbf239adbad0c':
AArch64: Use long for pointers in MTP classes
Diffstat (limited to 'media/java/android/mtp/MtpDevice.java')
| -rw-r--r-- | media/java/android/mtp/MtpDevice.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java index 926364f52db4..72dcaa8409a9 100644 --- a/media/java/android/mtp/MtpDevice.java +++ b/media/java/android/mtp/MtpDevice.java @@ -235,7 +235,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(); |