Commit ba4ddeb0 authored Mar 14, 2022 by Mike Yu Committed by Automerger Merge Worker Mar 14, 2022

Merge "DoH: Use DoH feature in T if the flag is unset" am: adc98bd9

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

Change-Id: I86bc5443bc9700bbd3425bf36c4be4a5a9170655

parents 3b244dd5 adc98bd9

util.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,5 +61,6 @@ inline bool isUserDebugBuild() {
		}

		inline bool isDoHEnabled() {
		return android::net::Experiments::getInstance()->getFlag("doh", 0);
		static bool isAtLeastT = android::modules::sdklevel::IsAtLeastT();
		return android::net::Experiments::getInstance()->getFlag("doh", isAtLeastT ? 1 : 0);
		}