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

Commit 87808b04 authored Jun 16, 2022 by Treehugger Robot Committed by Automerger Merge Worker Jun 16, 2022

Merge "Fix bugprone-branch-clone warnings" am: e7d8d30f

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

Change-Id: I18040cb30f279923f6485ae315bab9d393035ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6c20d1c2 e7d8d30f

PrivateDnsConfiguration.cpp

+2 −5

Original line number	Diff line number	Diff line
		@@ -301,11 +301,8 @@ bool PrivateDnsConfiguration::recordPrivateDnsValidation(const ServerIdentity& i
		}

		bool reevaluationStatus = NEEDS_REEVALUATION;
		if (success) {
		reevaluationStatus = DONT_REEVALUATE;
		} else if (mode->second == PrivateDnsMode::OFF) {
		reevaluationStatus = DONT_REEVALUATE;
		} else if (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation) {
		if (success \|\| (mode->second == PrivateDnsMode::OFF) \|\|
		(mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation)) {
		reevaluationStatus = DONT_REEVALUATE;
		}

res_send.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -1454,9 +1454,7 @@ int res_tls_send(const std::list<DnsTlsServer>& tlsServers, ResState* statp, con
		// It's OPPORTUNISTIC mode,
		// hence it's not required to do anything because it'll fallback to UDP.
		case DnsTlsTransport::Response::network_error:
		[[fallthrough]];
		case DnsTlsTransport::Response::internal_error:
		[[fallthrough]];
		default:
		return -1;
		}