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

Commit ef114590 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 

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



Change-Id: I52e2f46fb0cfb39b48de16ffaac907a267b36f6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b45cc9f3 d6b2e5bf

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;

}