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

Commit 140f47ca 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 

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

Change-Id: Ia0e92fef613ca566580d85573d6e5d04f960dd81
parents 7ac83d68 adc98bd9

util.h

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

}





inline bool isDoHEnabled() {

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

}
 
}