Commit b25d1fc2 authored Feb 18, 2022 by Mike Yu Committed by Automerger Merge Worker Feb 18, 2022

DoH: Don't enable it in T by default am: 15aa9edd am: 25b4676c

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

Change-Id: Ifacd73845de23c1974cd033024a46c9785abff83

parents c499f755 25b4676c

util.h

+0 −4

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

		inline bool isDoHEnabled() {
		// STOPSHIP(b/200763585): clean up it before T shipping.
		static bool isAtLeastT = android::modules::sdklevel::IsAtLeastT();
		if (isAtLeastT) return 1;

		return android::net::Experiments::getInstance()->getFlag("doh", 0);
		}