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

Commit 3ed83c51 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Not abort when the function is not found in dns_helper.so am: d6b2e5bf am: ef114590 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2887028



Change-Id: I65cc925d4c410c7b3432787dc9496e61fe151ff8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6345b426 ef114590

DnsProxyListener.cpp

+4 −2
Original line number Diff line number Diff line
@@ -685,7 +685,8 @@ IsUidBlockedFn resolveIsUidNetworkingBlockedFn() { 
    InitFn ADnsHelper_init = reinterpret_cast<InitFn>(dlsym(handle, "ADnsHelper_init"));

    if (!ADnsHelper_init) {

        LOG(ERROR) << __func__ << ": " << dlerror();

        abort();

        // TODO: Change to abort() when NDK is finalized

        return nullptr;

    }

    const int ret = (*ADnsHelper_init)();

    if (ret) {
@@ -697,7 +698,8 @@ IsUidBlockedFn resolveIsUidNetworkingBlockedFn() { 
            reinterpret_cast<IsUidBlockedFn>(dlsym(handle, "ADnsHelper_isUidNetworkingBlocked"));

    if (!f) {

        LOG(ERROR) << __func__ << ": " << dlerror();

        abort();

        // TODO: Change to abort() when NDK is finalized

        return nullptr;

    }

    return f;

}