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

Commit 23664e6c authored by Luke Huang's avatar Luke Huang Committed by Automerger Merge Worker
Browse files

Default enable DoH feature in T am: b39686b4 

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

Change-Id: I2f2adc4bbcd3378dac84e9b83e6ae6cf7172c825
parents 0a571d21 b39686b4

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ cc_library { 
        "libcutils",

        "libnetdutils",

        "libdoh_ffi",

        "libmodules-utils-build",

        "libprotobuf-cpp-lite",

        "libstatslog_resolv",

        "libstatspush_compat",

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ cc_test { 
        "libbpf_android",

        "libcrypto_static",

        "libgmock",

        "libmodules-utils-build",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_metrics_listener",

        "libnetd_test_resolv_utils",

util.h

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <netinet/in.h>



#include <android-base/properties.h>

#include <android-modules-utils/sdk_level.h>



#include "Experiments.h"
@@ -60,5 +61,8 @@ inline bool isUserDebugBuild() { 
}



inline bool isDoHEnabled() {

    // STOPSHIP(b/200763585): clean up it before T shipping.

    if (android::modules::sdklevel::IsAtLeastT()) return 1;



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

}