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, 1 insertions, 3 deletions

diff --git a/Dns64Configuration.cpp b/Dns64Configuration.cpp
index fc1428db..c09ce368 100644
--- a/Dns64Configuration.cpp
+++ b/Dns64Configuration.cpp
@@ -24,7 +24,6 @@
 #include <netdutils/DumpWriter.h>
 #include <netdutils/InternetAddresses.h>
 #include <netdutils/ThreadUtil.h>
-#include <utils/StrongPointer.h>
 #include <thread>
 #include <utility>
 
@@ -37,7 +36,6 @@
 
 namespace android {
 
-using android::sp;
 using netdutils::DumpWriter;
 using netdutils::IPAddress;
 using netdutils::IPPrefix;
@@ -63,7 +61,7 @@ void Dns64Configuration::startPrefixDiscovery(unsigned netId) {
     // Emplace a copy of |cfg| in the map.
     mDns64Configs.emplace(std::make_pair(netId, cfg));
 
-    const sp<Dns64Configuration> thiz = sp<Dns64Configuration>::fromExisting(this);
+    const std::shared_ptr<Dns64Configuration> thiz = shared_from_this();
     // Note that capturing |cfg| in this lambda creates a copy.
     std::thread discovery_thread([thiz, cfg, netId] {
         setThreadName(fmt::format("Nat64Pfx_{}", netId));