diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-06 10:06:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-06 10:06:06 +0000 |
| commit | 5137415e391d8491d92535b17445ab646a3fcb5d (patch) | |
| tree | d7be30fbb1b8eb11cf69c0d4c307e11acaa20737 /media/jni | |
| parent | 024191b57f2165e4d0c2c579f95046d491feacb5 (diff) | |
| parent | 8bd6a203ca753e9181564221e4faf7703d520b78 (diff) | |
| download | frameworks_base-5137415e391d8491d92535b17445ab646a3fcb5d.zip frameworks_base-5137415e391d8491d92535b17445ab646a3fcb5d.tar.gz frameworks_base-5137415e391d8491d92535b17445ab646a3fcb5d.tar.bz2 | |
Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaRecorder.cpp | 2 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 2 |
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); } } |