summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorHaitao Feng <haitao.feng@intel.com>2014-12-31 13:48:08 +0800
committerNarayan Kamath <narayan@google.com>2015-01-06 09:57:13 +0000
commit8bd6a203ca753e9181564221e4faf7703d520b78 (patch)
tree7b3d47a0c0b3fb04c44526544347f4035edf529e /media/jni
parent72d33849fea5de45087bfa79e645fa282ce8fcef (diff)
downloadframeworks_base-8bd6a203ca753e9181564221e4faf7703d520b78.zip
frameworks_base-8bd6a203ca753e9181564221e4faf7703d520b78.tar.gz
frameworks_base-8bd6a203ca753e9181564221e4faf7703d520b78.tar.bz2
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
CallStaticVoidMethod is varargs function, and calling it with a literal 0 like CallStaticVoidMethod(..., 0) will treat the argument as a 4 byte int in both 32 and 64 bit processes. This is incorrect for pointer arguments where NULL should be used instead. Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com> Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/android_media_MediaRecorder.cpp2
-rw-r--r--media/jni/audioeffect/android_media_Visualizer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 914b8a6..fcc3438 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -102,7 +102,7 @@ void JNIMediaRecorderListener::notify(int msg, int ext1, int ext2)
ALOGV("JNIMediaRecorderListener::notify");
JNIEnv *env = AndroidRuntime::getJNIEnv();
- env->CallStaticVoidMethod(mClass, fields.post_event, mObject, msg, ext1, ext2, 0);
+ env->CallStaticVoidMethod(mClass, fields.post_event, mObject, msg, ext1, ext2, NULL);
}
// ----------------------------------------------------------------------------
diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp
index 9183ad2..460277f 100644
--- a/media/jni/audioeffect/android_media_Visualizer.cpp
+++ b/media/jni/audioeffect/android_media_Visualizer.cpp
@@ -325,7 +325,7 @@ static void android_media_visualizer_effect_callback(int32_t event,
fields.midPostNativeEvent,
callbackInfo->visualizer_ref,
NATIVE_EVENT_SERVER_DIED,
- 0, 0, 0);
+ 0, 0, NULL);
}
}