commit a6f7099343366fc427e8ae4e409d0058c23a8c96
author Narayan Kamath <narayan@google.com> Tue Jan 06 20:09:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 06 20:09:12 2015 +0000
tree 8185f2f910335cb270cbe7f6239384924cfc4e40
parent f70afa9b8f6750ecc18a0d934b5d4b655f4267c2
parent 031acc4b3920336e58c56abb99322cbeb9be9e5c

am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."

* commit '031acc4b3920336e58c56abb99322cbeb9be9e5c':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.

media/jni/android_media_MediaRecorder.cpp

diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 635a519..8b7d40d 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -102,7 +102,7 @@
     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);
 }
 
 // ----------------------------------------------------------------------------

media/jni/audioeffect/android_media_Visualizer.cpp

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 @@
             fields.midPostNativeEvent,
             callbackInfo->visualizer_ref,
             NATIVE_EVENT_SERVER_DIED,
-            0, 0, 0);
+            0, 0, NULL);
     }
 }