diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-06 10:16:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 10:16:34 +0000 |
| commit | 031acc4b3920336e58c56abb99322cbeb9be9e5c (patch) | |
| tree | 4b15bd4bcb50922ac854ef4429109e96281cd4e0 /media/jni/audioeffect | |
| parent | 721d0994dc6ed370e359a33a6798f87389a428c8 (diff) | |
| parent | 3787decd8d41320ec9201405ec4cc893b2c99d78 (diff) | |
| download | frameworks_base-031acc4b3920336e58c56abb99322cbeb9be9e5c.zip frameworks_base-031acc4b3920336e58c56abb99322cbeb9be9e5c.tar.gz frameworks_base-031acc4b3920336e58c56abb99322cbeb9be9e5c.tar.bz2 | |
am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '3787decd8d41320ec9201405ec4cc893b2c99d78':
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
Diffstat (limited to 'media/jni/audioeffect')
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |