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

Commit 8f5691fd authored by You Kim's avatar You Kim
Browse files

Add return after NULL check in JetPlayer 

When pointer lpJet is NULL, it should return.

Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
parent 74199056

core/jni/android_media_JetPlayer.cpp

+24 −12
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ android_media_JetPlayer_loadFromFile(JNIEnv *env, jobject thiz, jstring path) 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for openFile()");

        return JNI_FALSE;

    }



    // set up event callback function
@@ -169,6 +170,7 @@ android_media_JetPlayer_loadFromFileD(JNIEnv *env, jobject thiz, 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for openFile()");

        return JNI_FALSE;

    }



    // set up event callback function
@@ -198,6 +200,7 @@ android_media_JetPlayer_closeFile(JNIEnv *env, jobject thiz) 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for closeFile()");

        return JNI_FALSE;

    }



    if (lpJet->closeFile()==EAS_SUCCESS) {
@@ -219,6 +222,7 @@ android_media_JetPlayer_play(JNIEnv *env, jobject thiz) 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for play()");

        return JNI_FALSE;

    }



    EAS_RESULT result = lpJet->play();
@@ -242,6 +246,7 @@ android_media_JetPlayer_pause(JNIEnv *env, jobject thiz) 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for pause()");

        return JNI_FALSE;

    }



    EAS_RESULT result = lpJet->pause();
@@ -271,6 +276,7 @@ android_media_JetPlayer_queueSegment(JNIEnv *env, jobject thiz, 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for queueSegment()");

        return JNI_FALSE;

    }



    EAS_RESULT result
@@ -297,6 +303,7 @@ android_media_JetPlayer_queueSegmentMuteArray(JNIEnv *env, jobject thiz, 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for queueSegmentMuteArray()");

        return JNI_FALSE;

    }



    EAS_RESULT result=EAS_FAILURE;
@@ -342,6 +349,7 @@ android_media_JetPlayer_setMuteFlags(JNIEnv *env, jobject thiz, 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for setMuteFlags()");

        return JNI_FALSE;

    }



    EAS_RESULT result;
@@ -366,6 +374,7 @@ android_media_JetPlayer_setMuteArray(JNIEnv *env, jobject thiz, 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for setMuteArray()");

        return JNI_FALSE;

    }



    EAS_RESULT result=EAS_FAILURE;
@@ -411,6 +420,7 @@ android_media_JetPlayer_setMuteFlag(JNIEnv *env, jobject thiz, 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for setMuteFlag()");

        return JNI_FALSE;

    }



    EAS_RESULT result;
@@ -436,6 +446,7 @@ android_media_JetPlayer_triggerClip(JNIEnv *env, jobject thiz, jint clipId) 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for triggerClip()");

        return JNI_FALSE;

    }



    EAS_RESULT result;
@@ -460,6 +471,7 @@ android_media_JetPlayer_clearQueue(JNIEnv *env, jobject thiz) 
    if (lpJet == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException",

            "Unable to retrieve JetPlayer pointer for clearQueue()");

        return JNI_FALSE;

    }



    EAS_RESULT result = lpJet->clearQueue();