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

Commit 8ab1cc9a authored by Mike Yu's avatar Mike Yu Committed by android-build-merger
Browse files

Fix setResolverConfiguration to return negative error code

am: 65b4e5bc

Change-Id: If510b2d51d37a14c48f581c2fbb3155b25702888
parents 3a125a1d 65b4e5bc
Loading
Loading
Loading
Loading
+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);
}

+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,