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

Commit 1bf347c3 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I41071a1caa74cb42be9ebfb7e59f3fdd58c6685a
parents 028278a1 140f47ca

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);

}