diff options
| author | Robert Shih <robertshih@google.com> | 2014-02-05 10:42:01 -0800 |
|---|---|---|
| committer | Nicholas Sauer <nicksauer@google.com> | 2014-05-30 14:56:55 +0000 |
| commit | a034dac7be0658e59c73a880e958cab3c723323b (patch) | |
| tree | 2140141203acd71e3be7db023f6e099f3a21452a | |
| parent | aeb4e071abb100d10c39d154b05c2911d399395d (diff) | |
| download | frameworks_base-a034dac7be0658e59c73a880e958cab3c723323b.zip frameworks_base-a034dac7be0658e59c73a880e958cab3c723323b.tar.gz frameworks_base-a034dac7be0658e59c73a880e958cab3c723323b.tar.bz2 | |
android_media_MediaMuxer_setLocation: amended signature.
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.
Bug: 15337287
Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)
| -rw-r--r-- | media/jni/android_media_MediaMuxer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp index 2c16a05..ea890c2 100644 --- a/media/jni/android_media_MediaMuxer.cpp +++ b/media/jni/android_media_MediaMuxer.cpp @@ -164,7 +164,7 @@ static void android_media_MediaMuxer_setOrientationHint( } static void android_media_MediaMuxer_setLocation( - JNIEnv *env, jclass clazz, jint nativeObject, jint latitude, jint longitude) { + JNIEnv *env, jclass clazz, jlong nativeObject, jint latitude, jint longitude) { MediaMuxer* muxer = reinterpret_cast<MediaMuxer *>(nativeObject); status_t res = muxer->setLocation(latitude, longitude); |