summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-08-05 17:27:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-05 17:27:29 +0000
commit094010925a1b9db5238c495bea48c606e87d6e32 (patch)
tree719c79090456148e493ba6d7df7e80e722018f90
parente6a0b7dea21cae5440d71e49eec8981f88413b3e (diff)
parenta667ff30e4fb6f741c2a930e7c31ef7e962d3b40 (diff)
downloadframeworks_base-094010925a1b9db5238c495bea48c606e87d6e32.zip
frameworks_base-094010925a1b9db5238c495bea48c606e87d6e32.tar.gz
frameworks_base-094010925a1b9db5238c495bea48c606e87d6e32.tar.bz2
Merge "Explicitly compare raw pointers to NULL"
-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 7a5aadb..51ba52a 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,