aboutsummaryrefslogtreecommitdiff
path: root/ResolverController.cpp
diff options
context:
space:
mode:
authorlifr <lifr@google.com>2019-07-26 03:17:43 +0800
committerlifr <lifr@google.com>2019-07-31 16:37:41 +0800
commit6b83a6ffcbcdeafbb34fa21bbcdba2a8a966d73b (patch)
tree2e35f8889ce1074c1d2b19d18b6d7e27ee710b47 /ResolverController.cpp
parent474550f5a3c3d79667ed0bffca0185905e07e1df (diff)
Restore the PrivateDnsMode emun to its original definition
Westworld requires the first field of all enums to be set to UNKNOWN/UNSET, but this is awkward for the resolver code and makes it hard to verify whether we have any PrivateDnsMode variables initialized to UNKNOWN by accident. So revert this change, and add a simple function to convert the internal PrivateDnsMode enum to the other PrivateDnsMode emun defined in the stats proto. Bug: 119862317 Test: atest Change-Id: Id146a16e41e0183867b3a4e2d87a2b0fc09df27d Merged-In: I35908fac7f089c1fac507bae63b02ebb46ad50a9 Merged-In: I6054faa82f9a3cdc843fd6dcbd11d5cef75edd98 Merged-In: I74c7b4145d1469010d3e205183012a9b830f0a55 Merged-In: Id146a16e41e0183867b3a4e2d87a2b0fc09df27d
Diffstat (limited to 'ResolverController.cpp')
-rw-r--r--ResolverController.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/ResolverController.cpp b/ResolverController.cpp
index a56f5e58..8296826b 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -57,8 +57,6 @@ std::string addrToString(const sockaddr_storage* addr) {
const char* getPrivateDnsModeString(PrivateDnsMode mode) {
switch (mode) {
- case PrivateDnsMode::UNKNOWN:
- return "UNKNOWN";
case PrivateDnsMode::OFF:
return "OFF";
case PrivateDnsMode::OPPORTUNISTIC: