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

Commit 65b4e5bc authored by Mike Yu's avatar Mike Yu
Browse files

Fix setResolverConfiguration to return negative error code 

This fixes the logging bug in dumpsys netd.

For example, when resolv_set_nameservers fails:
It used to print
    setResolverConfiguration() -> ServiceSpecificException(-22, "Unknown error -22") <0.18ms>

After the fix, it prints
    setResolverConfiguration() -> ServiceSpecificException(22, "Invalid argument") <0.28ms>

Test: m com.android.resolv
Change-Id: I916e6e31dcdd2f421592e8ca71663ffbddc7b3b5
parent c4f469ad

ResolverController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ int ResolverController::setResolverConfiguration(const ResolverParamsParcel& res 
    res_params.base_timeout_msec = resolverParams.baseTimeoutMsec;

    res_params.retry_count = resolverParams.retryCount;



    return -resolv_set_nameservers(resolverParams.netId, resolverParams.servers,

    return resolv_set_nameservers(resolverParams.netId, resolverParams.servers,

                                  resolverParams.domains, res_params);

}

ResolverController.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class ResolverController { 
    int getPrefix64(unsigned netId, netdutils::IPPrefix* prefix);



    // Binder specific functions, which convert between the ResolverParamsParcel and the

    // actual data structures, and call setDnsServer() / getDnsInfo() for the actual processing.

    // actual data structures.

    int setResolverConfiguration(const aidl::android::net::ResolverParamsParcel& resolverParams);



    int getResolverInfo(int32_t netId, std::vector<std::string>* servers,