Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09401092 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Explicitly compare raw pointers to NULL"

parents e6a0b7de a667ff30

core/jni/android_media_AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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,

core/jni/android_media_AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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,