| commit | adc98bd97bf52878513e060edead999526ea101a | [log] [tgz] |
|---|---|---|
| author | Mike Yu <yumike@google.com> | Mon Mar 14 06:10:03 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Mar 14 06:10:03 2022 +0000 |
| tree | e1ab848c370bba8ba1c8850aa77fe6f9428ff8e7 | |
| parent | e0168482532d9258ca695ba36cdd1808e35f6df9 [diff] | |
| parent | d073bc5c7031503f4a20bb7812f4cb0b33859e29 [diff] |
Merge "DoH: Use DoH feature in T if the flag is unset"
diff --git a/util.h b/util.h index a591358..69665a9 100644 --- a/util.h +++ b/util.h
@@ -61,5 +61,6 @@ } 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); }