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

Commit a0db0224 authored by Kenny Root's avatar Kenny Root
Browse files

Add support for EINTR in BT 

During normal operation, it's common on a multi-core device to get
EINTR. This is especially noticable during a bugreport where several
services get EINTR even though it's not fatal.

This change adds TEMP_FAILURE_RETRY around the system calls that can
receive EINTR where a retry should happen.

Change-Id: If13d24f57c587392f57961fe2caf46e2a6fa843e
parent b001475f

core/jni/android_bluetooth_BluetoothAudioGateway.cpp

+5 −5
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int do_accept(JNIEnv* env, jobject object, int ag_fd, 


    struct sockaddr_rc raddr;

    int alen = sizeof(raddr);

    int nsk = accept(ag_fd, (struct sockaddr *) &raddr, &alen);

    int nsk = TEMP_FAILURE_RETRY(accept(ag_fd, (struct sockaddr *) &raddr, &alen));

    if (nsk < 0) {

        ALOGE("Error on accept from socket fd %d: %s (%d).",

             ag_fd,
@@ -331,12 +331,12 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, 
        to.tv_sec = timeout_ms / 1000;

        to.tv_usec = 1000 * (timeout_ms % 1000);

    }

    n = select(MAX(nat->hf_ag_rfcomm_sock,

                       nat->hs_ag_rfcomm_sock) + 1,

    n = TEMP_FAILURE_RETRY(select(

                   MAX(nat->hf_ag_rfcomm_sock, nat->hs_ag_rfcomm_sock) + 1,

                   &rset,

                   NULL,

                   NULL,

                   (timeout_ms < 0 ? NULL : &to));

                   (timeout_ms < 0 ? NULL : &to)));

    if (timeout_ms > 0) {

        jint remaining = to.tv_sec*1000 + to.tv_usec/1000;

        ALOGI("Remaining time %ldms", (long)remaining);
@@ -391,7 +391,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, 
        ALOGE("Neither HF nor HS listening sockets are open!");

        return JNI_FALSE;

    }

    n = poll(fds, cnt, timeout_ms);

    n = TEMP_FAILURE_RETRY(poll(fds, cnt, timeout_ms));

    if (n <= 0) {

        if (n < 0)  {

            ALOGE("listening poll() on RFCOMM sockets: %s (%d)",