Sync the proto stats.proto from dns_resolver.proto

(Need to match as aosp/968223)

Bug: 119862317
Test: ./out/host/linux-x86/bin/statsd_testdrive 116

Merged-In: I13a40327754600aa57aba41cc9d487f7c9bb036e
Merged-In: I7fb3011c206016c3e7b7aab50b03903c0ae894db
(cherry picked from commit dc20156cb022e4c821d5ec7cf43fe17e9378f557)

Change-Id: Iedae482dafa61d6c3401b12f5414855b0633e439

1 files changed, 19 insertions, 17 deletions

diff --git a/resolv/stats.proto b/resolv/stats.proto
index dd9992c5..d6fc5779 100644
--- a/resolv/stats.proto
+++ b/resolv/stats.proto
@@ -68,6 +68,7 @@ enum NsRcode {
     // NS_R_BADSIG  = 16,
     NS_R_BADKEY = 17;
     NS_R_BADTIME = 18;
+    NS_R_TIMEOUT = 255;
 }
 
 // Currently defined type values for resources and queries.
@@ -144,11 +145,11 @@ enum IpVersion {
     IV_IPV6 = 2;
 }
 
-enum TransportType {
-    TT_UNKNOWN = 0;
-    TT_UDP = 1;
-    TT_TCP = 2;
-    TT_DOT = 3;
+enum Protocol {
+    PROTO_UNKNOWN = 0;
+    PROTO_UDP = 1;
+    PROTO_TCP = 2;
+    PROTO_DOT = 3;
 }
 
 enum PrivateDnsModes {
@@ -158,21 +159,22 @@ enum PrivateDnsModes {
     PDM_STRICT = 3;
 }
 
-enum Transport {
+enum NetworkType {
+    NT_UNKNOWN = 0;
     // Indicates this network uses a Cellular transport.
-    TRANSPORT_DEFAULT = 0;  // TRANSPORT_CELLULAR
+    NT_CELLULAR = 1;
     // Indicates this network uses a Wi-Fi transport.
-    TRANSPORT_WIFI = 1;
+    NT_WIFI = 2;
     // Indicates this network uses a Bluetooth transport.
-    TRANSPORT_BLUETOOTH = 2;
+    NT_BLUETOOTH = 3;
     // Indicates this network uses an Ethernet transport.
-    TRANSPORT_ETHERNET = 3;
+    NT_ETHERNET = 4;
     // Indicates this network uses a VPN transport.
-    TRANSPORT_VPN = 4;
+    NT_VPN = 5;
     // Indicates this network uses a Wi-Fi Aware transport.
-    TRANSPORT_WIFI_AWARE = 5;
+    NT_WIFI_AWARE = 6;
     // Indicates this network uses a LoWPAN transport.
-    TRANSPORT_LOWPAN = 6;
+    NT_LOWPAN = 7;
 }
 
 enum CacheStatus{
@@ -196,13 +198,13 @@ message DnsQueryEvent {
 
     optional IpVersion ip_version = 4;
 
-    optional TransportType transport = 5;
+    optional Protocol protocol = 5;
 
     // Number of DNS query retry times
     optional int32 retry_times = 6;
 
     // Ordinal number of name server.
-    optional int32 dns_server_count = 7;
+    optional int32 dns_server_index = 7;
 
     // Used only by TCP and DOT. True for new connections.
     optional bool connected = 8;
@@ -238,7 +240,7 @@ message NetworkDnsEventReported {
     // Only valid for event_type = EVENT_RESNSEND.
     optional int32 res_nsend_flags = 5;
 
-    optional Transport network_type = 6;
+    optional NetworkType network_type = 6;
 
     // The DNS over TLS mode on a specific netId.
     optional PrivateDnsModes private_dns_modes = 7;
@@ -246,4 +248,4 @@ message NetworkDnsEventReported {
     // Additional pass-through fields opaque to statsd.
     // The DNS resolver Mainline module can add new fields here without requiring an OS update.
     optional DnsQueryEvents dns_query_events = 8;
-}
\ No newline at end of file
+}