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

Commit 8f90124e authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Remove dead code in PrivateDnsConfiguration am: 1f663fc2 am: f6378943 

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

Change-Id: Ieb586837645e5238325c6cf31325b2fd8cecb37f
parents d863f360 f6378943

DnsTlsDispatcher.cpp

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ DnsTlsTransport::Result DnsTlsDispatcher::queryInternal(Transport& xport, 


    const auto status = res.wait_for(xport.timeout());

    if (status == std::future_status::timeout) {

        // TODO: notify the Transport to remove the query because no queries will await this future.

        // b/186613628.

        // TODO(b/186613628): notify the Transport to remove this query.

        LOG(WARNING) << "DoT query timed out after " << xport.timeout().count() << " ms";

        return DnsTlsTransport::Result{

                .code = DnsTlsTransport::Response::network_error,

PrivateDnsConfiguration.cpp

+0 −2
Original line number Diff line number Diff line
@@ -308,8 +308,6 @@ bool PrivateDnsConfiguration::recordPrivateDnsValidation(const DnsTlsServer& ser 
        success = false;

        reevaluationStatus = DONT_REEVALUATE;

    } else if (!(serverPair->second == server)) {

        // TODO: It doesn't seem correct to overwrite the tracker entry for

        // |server| down below in this circumstance... Fix this.

        LOG(WARNING) << "Server " << server.toIpString()

                     << " was changed during private DNS validation";

        success = false;

PrivateDnsConfiguration.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ class PrivateDnsConfiguration { 


  private:

    typedef std::map<ServerIdentity, DnsTlsServer> PrivateDnsTracker;

    typedef std::set<DnsTlsServer, AddressComparator> ThreadTracker;



    PrivateDnsConfiguration() = default;