commit 15aa9eddd326b8a548bd0ec7372a4e66b0a67f53
author Mike Yu <yumike@google.com> Thu Feb 17 14:24:25 2022 +0800
committer Mike Yu <yumike@google.com> Thu Feb 17 14:36:30 2022 +0800
tree 3b62cd3ac7593b522843bcfe0733396ab0d61815
parent 882eeb91d914fb540cc9dbff745ebea37b820b45

DoH: Don't enable it in T by default

Bug: 200763585
Bug: 155855709
Test: cd packages/modules/DnsResolver && atest
Change-Id: Iecd7bdd926c6651ae66d20e0946c10662659e5da

util.h

diff --git a/util.h b/util.h
index 414b62f..a591358 100644
--- a/util.h
+++ b/util.h
@@ -61,9 +61,5 @@
 }
 
 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);
 }