diff options
| author | Ken Chen <cken@google.com> | 2023-09-11 07:45:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-11 07:45:33 +0000 |
| commit | a3f8533bbad27cedc5234323d00cdd511d4db1e8 (patch) | |
| tree | df1cf3b101d9464e01a518f44484e33130151342 /ResolverController.cpp | |
| parent | 51c27ec738ea19abacd28581f5c74781b93468ee (diff) | |
| parent | eaa76e6252bbc448b943d8efcacc188296cb8aa1 (diff) | |
[Code Health] Move 'using' out of functions am: 592e8227b2 am: eaa76e6252
Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2746594
Change-Id: I5a99567cb8fcd373bf1a67f85105fdf6510a86fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'ResolverController.cpp')
| -rw-r--r-- | ResolverController.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ResolverController.cpp b/ResolverController.cpp index 8e3b058f..10f142c7 100644 --- a/ResolverController.cpp +++ b/ResolverController.cpp @@ -37,9 +37,11 @@ #include "stats.h" #include "util.h" +using aidl::android::net::IDnsResolver; using aidl::android::net::ResolverParamsParcel; using aidl::android::net::resolv::aidl::IDnsResolverUnsolicitedEventListener; using aidl::android::net::resolv::aidl::Nat64PrefixEventParcel; +using android::net::ResolverStats; namespace android { @@ -79,8 +81,6 @@ void sendNat64PrefixEvent(const Dns64Configuration::Nat64PrefixInfo& args) { int getDnsInfo(unsigned netId, std::vector<std::string>* servers, std::vector<std::string>* domains, res_params* params, std::vector<android::net::ResolverStats>* stats, int* wait_for_pending_req_timeout_count) { - using aidl::android::net::IDnsResolver; - using android::net::ResolverStats; static_assert(ResolverStats::STATS_SUCCESSES == IDnsResolver::RESOLVER_STATS_SUCCESSES && ResolverStats::STATS_ERRORS == IDnsResolver::RESOLVER_STATS_ERRORS && ResolverStats::STATS_TIMEOUTS == IDnsResolver::RESOLVER_STATS_TIMEOUTS && @@ -245,8 +245,6 @@ int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* std::vector<std::string>* tlsServers, std::vector<int32_t>* params, std::vector<int32_t>* stats, int* wait_for_pending_req_timeout_count) { - using aidl::android::net::IDnsResolver; - using android::net::ResolverStats; res_params res_params; std::vector<ResolverStats> res_stats; int ret = getDnsInfo(netId, servers, domains, &res_params, &res_stats, @@ -293,7 +291,6 @@ int ResolverController::getPrefix64(unsigned netId, netdutils::IPPrefix* prefix) void ResolverController::dump(DumpWriter& dw, unsigned netId) { // No lock needed since Bionic's resolver locks all accessed data structures internally. - using android::net::ResolverStats; std::vector<std::string> servers; std::vector<std::string> domains; res_params params = {}; |