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

Commit 29f48041 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' into eclair-a2sd

parents 9ee39ba7 46c8b4b9

core/jni/android_server_BluetoothEventLoop.cpp

+12 −5
Original line number Diff line number Diff line
@@ -571,7 +571,10 @@ static void *eventLoopMain(void *ptr) { 
                                NULL, NULL, NULL, NULL, NULL);

                        tearDownEventLoop(nat);

                        nat->vm->DetachCurrentThread();

                        shutdown(nat->controlFdR,SHUT_RDWR);



                        int fd = nat->controlFdR;

                        nat->controlFdR = 0;

                        close(fd);

                        return NULL;

                    }

                    case EVENT_LOOP_ADD:
@@ -660,9 +663,12 @@ static jboolean startEventLoopNative(JNIEnv *env, jobject object) { 


done:

    if (JNI_FALSE == result) {

        if (nat->controlFdW || nat->controlFdR) {

            shutdown(nat->controlFdW, SHUT_RDWR);

        if (nat->controlFdW) {

            close(nat->controlFdW);

            nat->controlFdW = 0;

        }

        if (nat->controlFdR) {

            close(nat->controlFdR);

            nat->controlFdR = 0;

        }

        if (nat->me) env->DeleteGlobalRef(nat->me);
@@ -699,9 +705,10 @@ static void stopEventLoopNative(JNIEnv *env, jobject object) { 
        nat->watchData = NULL;

        nat->pollDataSize = 0;

        nat->pollMemberCount = 0;

        shutdown(nat->controlFdW, SHUT_RDWR);



        int fd = nat->controlFdW;

        nat->controlFdW = 0;

        nat->controlFdR = 0;

        close(fd);

    }

    pthread_mutex_unlock(&(nat->thread_mutex));

#endif // HAVE_BLUETOOTH