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

Commit 3a0d1d11 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

parents 058e385b b8aa0376

core/jni/android_bluetooth_common.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct event_loop_native_data_t { 
    int envVer;

    /* reference to our java self */

    jobject me;

    /* flag to indicate if the event loop thread is running */

    bool running;

};



struct _Properties {

core/jni/android_server_BluetoothEventLoop.cpp

+7 −2
Original line number Diff line number Diff line
@@ -548,6 +548,8 @@ static void *eventLoopMain(void *ptr) { 
    dbus_connection_set_watch_functions(nat->conn, dbusAddWatch,

            dbusRemoveWatch, dbusToggleWatch, ptr, NULL);



    nat->running = true;



    while (1) {

        for (int i = 0; i < nat->pollMemberCount; i++) {

            if (!nat->pollData[i].revents) {
@@ -607,6 +609,8 @@ static jboolean startEventLoopNative(JNIEnv *env, jobject object) { 


    pthread_mutex_lock(&(nat->thread_mutex));



    nat->running = false;



    if (nat->pollData) {

        LOGW("trying to start EventLoop a second time!");

        pthread_mutex_unlock( &(nat->thread_mutex) );
@@ -703,6 +707,7 @@ static void stopEventLoopNative(JNIEnv *env, jobject object) { 
        nat->controlFdW = 0;

        close(fd);

    }

    nat->running = false;

    pthread_mutex_unlock(&(nat->thread_mutex));

#endif // HAVE_BLUETOOTH

}
@@ -713,7 +718,7 @@ static jboolean isEventLoopRunningNative(JNIEnv *env, jobject object) { 
    native_data_t *nat = get_native_data(env, object);



    pthread_mutex_lock(&(nat->thread_mutex));

    if (nat->pollData) {

    if (nat->running) {

        result = JNI_TRUE;

    }

    pthread_mutex_unlock(&(nat->thread_mutex));