summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-22 07:36:34 -0700
committerGlenn Kasten <gkasten@google.com>2013-08-02 14:51:12 -0700
commita667ff30e4fb6f741c2a930e7c31ef7e962d3b40 (patch)
treec6af90c582b638b5a7c12839730746a828b2d901 /core/jni
parent474daa2b7838402a1ef81140a512613e1b37a54e (diff)
downloadframeworks_base-a667ff30e4fb6f741c2a930e7c31ef7e962d3b40.zip
frameworks_base-a667ff30e4fb6f741c2a930e7c31ef7e962d3b40.tar.gz
frameworks_base-a667ff30e4fb6f741c2a930e7c31ef7e962d3b40.tar.bz2
Explicitly compare raw pointers to NULL
Change-Id: If76a15509d4121e391e28f26ca273cc00552efa8
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_media_AudioRecord.cpp4
-rw-r--r--core/jni/android_media_AudioTrack.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index a8fef2d..9c00182 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -95,7 +95,7 @@ static void recorderCallback(int event, void* user, void *info) {
switch (event) {
case AudioRecord::EVENT_MARKER: {
JNIEnv *env = AndroidRuntime::getJNIEnv();
- if (user && env) {
+ if (user != NULL && env != NULL) {
env->CallStaticVoidMethod(
callbackInfo->audioRecord_class,
javaAudioRecordFields.postNativeEventInJava,
@@ -109,7 +109,7 @@ static void recorderCallback(int event, void* user, void *info) {
case AudioRecord::EVENT_NEW_POS: {
JNIEnv *env = AndroidRuntime::getJNIEnv();
- if (user && env) {
+ if (user != NULL && env != NULL) {
env->CallStaticVoidMethod(
callbackInfo->audioRecord_class,
javaAudioRecordFields.postNativeEventInJava,
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index a1b85bc..660b204 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -134,7 +134,7 @@ static void audioCallback(int event, void* user, void *info) {
switch (event) {
case AudioTrack::EVENT_MARKER: {
JNIEnv *env = AndroidRuntime::getJNIEnv();
- if (user && env) {
+ if (user != NULL && env != NULL) {
env->CallStaticVoidMethod(
callbackInfo->audioTrack_class,
javaAudioTrackFields.postNativeEventInJava,
@@ -148,7 +148,7 @@ static void audioCallback(int event, void* user, void *info) {
case AudioTrack::EVENT_NEW_POS: {
JNIEnv *env = AndroidRuntime::getJNIEnv();
- if (user && env) {
+ if (user != NULL && env != NULL) {
env->CallStaticVoidMethod(
callbackInfo->audioTrack_class,
javaAudioTrackFields.postNativeEventInJava,