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

Commit 8f5e6fce authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8013394 from a9c77ff4 to mainline-media-swcodec-release 

Change-Id: Iec21ae44f3bb31b61ece334550491396b46c9152
parents bcf1484e a9c77ff4

Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ aidl_interface { 
    backend: {

    backend: {

        java: {

        java: {

            apex_available: [

            apex_available: [

                "com.android.bluetooth.updatable",

                "com.android.tethering",

                "com.android.tethering",

                "com.android.wifi",

                "com.android.wifi",

            ],

            ],

res_send.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1141,7 +1141,7 @@ static int send_dg(ResState* statp, res_params* params, span<const uint8_t> msg, 
            // Leave the UDP sockets open on timeout so we can keep listening for

            // Leave the UDP sockets open on timeout so we can keep listening for

            // a late response from this server while retrying on the next server.

            // a late response from this server while retrying on the next server.

            if (!isTimeout) statp->closeSockets();

            if (!isTimeout) statp->closeSockets();

            LOG(DEBUG) << __func__ << ": " << (isTimeout) ? "timeout" : "poll";

            LOG(DEBUG) << __func__ << ": " << (isTimeout ? "timeout" : "poll");

            return 0;

            return 0;

        }

        }

        bool needRetry = false;

        bool needRetry = false;
@@ -1233,7 +1233,7 @@ static int send_mdns(ResState* statp, span<const uint8_t> msg, span<uint8_t> ans 
    if (retrying_poll(fd, POLLIN, &finish) <= 0) {

    if (retrying_poll(fd, POLLIN, &finish) <= 0) {

        *terrno = errno;

        *terrno = errno;

        if (*terrno == ETIMEDOUT) *rcode = RCODE_TIMEOUT;

        if (*terrno == ETIMEDOUT) *rcode = RCODE_TIMEOUT;

        LOG(ERROR) << __func__ << ": " << (*terrno == ETIMEDOUT) ? "timeout" : "poll";

        LOG(ERROR) << __func__ << ": " << ((*terrno == ETIMEDOUT) ? "timeout" : "poll failed");

        return 0;

        return 0;

    }

    }

tests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ cc_test { 
        "libutils",

        "libutils",

        "netd_aidl_interface-lateststable-ndk",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

        "libipchecksum",

        "libip_checksum",

        "resolv_unsolicited_listener",

        "resolv_unsolicited_listener",

        "libdoh_frontend_ffi",

        "libdoh_frontend_ffi",

    ],

    ],

tests/tun_forwarder.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <android-base/logging.h>

#include <android-base/logging.h>





extern "C" {

extern "C" {

#include <netutils/checksum.h>

#include <checksum.h>

}

}





using android::base::Error;

using android::base::Error;