Merge tag 'android-14.0.0_r50' of https://android.googlesource.com/platform/packages/modules/DnsResolver into u14.0HEADu14.0

Android 14.0.0 Release 50 (AP2A.240605.024)

1 files changed, 4 insertions, 2 deletions

diff --git a/DnsProxyListener.cpp b/DnsProxyListener.cpp
index e70ddb40..8064aef7 100644
--- a/DnsProxyListener.cpp
+++ b/DnsProxyListener.cpp
@@ -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;
 }