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

Commit daa2f913 authored by Jef Oliver's avatar Jef Oliver Committed by Gerrit Code Review
Browse files

Merge "FM Radio: avoid deadlock when disabling RDS" into jellybean

parents a2cf7b53 68fca3c9
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -1362,8 +1362,11 @@ static void androidFmRadioRxSetRDS(JNIEnv * env, jobject obj,
        /* if in pause state temporary resume */
        androidFmRadioTempResumeIfPaused(&fmReceiverSession);

        /* temporary unlock to avoid deadlock with RDS callback */
        pthread_mutex_unlock(fmReceiverSession.dataMutex_p);
        retval = fmReceiverSession.vendorMethods_p->
            set_rds_reception(&fmReceiverSession.vendorData_p, receiveRDS);
        pthread_mutex_lock(fmReceiverSession.dataMutex_p);

        androidFmRadioPauseIfTempResumed(&fmReceiverSession);
    } else {