From 1e3dffd334c3c5fd1c2b043802f307f5dfda2fdd Mon Sep 17 00:00:00 2001
From: Frank Li <lifr@google.com>
Date: Thu, 2 Apr 2020 20:19:43 +0000
Subject: [PATCH] Add new NetworkType for WIFI+CELLULAR+VPN transport

Define NT_WIFI_CELLULAR_VPN in enum NetworkType.
=>Indicates this network uses a WIFI+CELLULAR+VPN transport.

Bug: 143732914
Test: Manual test with statsd_testdrive
Merged-In: I1d43633705b69bf0111386630b2eebf394cb9366
Change-Id: I4575b912db7457e0e0c1dea4d1af07389a4cf394
(cherry picked from commit b1997b78ce414ec01b0e49caacd6c156ca5bbc35)
---
 core/proto/android/stats/dnsresolver/dns_resolver.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/proto/android/stats/dnsresolver/dns_resolver.proto b/core/proto/android/stats/dnsresolver/dns_resolver.proto
index afd109996722a..448c12dd8d293 100644
--- a/core/proto/android/stats/dnsresolver/dns_resolver.proto
+++ b/core/proto/android/stats/dnsresolver/dns_resolver.proto
@@ -184,6 +184,8 @@ enum NetworkType {
     NT_BLUETOOTH_VPN = 10;
     // Indicates this network uses an Ethernet+VPN transport.
     NT_ETHERNET_VPN = 11;
+    // Indicates this network uses a Wi-Fi+Cellular+VPN transport.
+    NT_WIFI_CELLULAR_VPN = 12;
 }
 
 enum CacheStatus{