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

Commit 152f7b39 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "If media player has died already, do not dec the old surface texture... 

Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664."
parents b851f15e e828beb3

media/jni/android_media_MediaPlayer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -247,6 +247,11 @@ getVideoSurfaceTexture(JNIEnv* env, jobject thiz) { 
static void

decVideoSurfaceRef(JNIEnv *env, jobject thiz)

{

    sp<MediaPlayer> mp = getMediaPlayer(env, thiz);

    if (mp == NULL) {

        return;

    }



    sp<ISurfaceTexture> old_st = getVideoSurfaceTexture(env, thiz);

    if (old_st != NULL) {

        old_st->decStrong(thiz);