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, 2 deletions

diff --git a/Dns64Configuration.h b/Dns64Configuration.h
index 4170e32d..35d3afed 100644
--- a/Dns64Configuration.h
+++ b/Dns64Configuration.h
@@ -27,7 +27,6 @@
 #include <android-base/thread_annotations.h>
 #include <netdutils/DumpWriter.h>
 #include <netdutils/InternetAddresses.h>
-#include <utils/RefBase.h>
 
 struct android_net_context;
 
@@ -49,7 +48,7 @@ namespace net {
  * Thread-safety: All public methods in this class MUST be thread-safe.
  * (In other words: this class handles all its locking privately.)
  */
-class Dns64Configuration : virtual public RefBase {
+class Dns64Configuration : public std::enable_shared_from_this<Dns64Configuration> {
   public:
     // Simple data struct for passing back packet NAT64 prefix event information to the
     // Dns64PrefixCallback callback.