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

Commit 5ac860b2 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Be explicit about binderCallLogFn" am: 488efbc5 am: fd7c4db3 

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

Change-Id: I8ce5789c7001686d62dbd561f000c549b6070fc1
parents 5ee2ef88 fd7c4db3

DnsResolverService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ inline ::ndk::ScopedAStatus statusFromErrcode(int ret) { 


DnsResolverService::DnsResolverService() {

    // register log callback to BnDnsResolver::logFunc

    BnDnsResolver::logFunc =

            std::bind(binderCallLogFn, std::placeholders::_1,

                      [](const std::string& msg) { gResNetdCallbacks.log(msg.c_str()); });

    BnDnsResolver::logFunc = [](const auto& log) {

        binderCallLogFn(log, [](const std::string& msg) { gResNetdCallbacks.log(msg.c_str()); });

    };

}



binder_status_t DnsResolverService::start() {

tests/dnsresolver_binder_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ class DnsResolverBinderTest : public ::testing::Test { 


    PossibleLogData toSetResolverConfigurationLogData(const ResolverParamsParcel& parms,

                                                      int returnCode = 0) {

        std::string outputWithParcel = "setResolverConfiguration(\"" + toString(parms) + "\")";

        std::string outputWithParcel = "setResolverConfiguration(" + toString(parms) + ")";

        std::string hintRegexWithParcel = fmt::format("setResolverConfiguration.*{}", parms.netId);



        std::string outputWithoutParcel = "setResolverConfiguration()";