From 0bdce42a7822b396ccaa2eac6512580ca9fac0c9 Mon Sep 17 00:00:00 2001
From: lifr <lifr@google.com>
Date: Fri, 7 Feb 2020 10:39:13 +0800
Subject: [PATCH] ADD new enum NetworkType to identify multiple transport type

Add new NetworkType for multiple transport
1. CELLULAR + VPN = NT_CELLULAR_VPN
2. WIFI + VPN = NT_WIFI_VPN
3. BLUETOOTH + VPN = NT_BLUETOOTH_VPN
4. Ethernet + VPN = NT_ETHERNET_VPN

Bug: 143732914
Test: atest
Change-Id: I0d106ca1631265b872386b59d542b206614f38ef
---
 .../android/stats/dnsresolver/dns_resolver.proto     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/proto/android/stats/dnsresolver/dns_resolver.proto b/core/proto/android/stats/dnsresolver/dns_resolver.proto
index 9eaabfbca4636..15ef12285e246 100644
--- a/core/proto/android/stats/dnsresolver/dns_resolver.proto
+++ b/core/proto/android/stats/dnsresolver/dns_resolver.proto
@@ -169,12 +169,20 @@ enum NetworkType {
     NT_BLUETOOTH = 3;
     // Indicates this network uses an Ethernet transport.
     NT_ETHERNET = 4;
-    // Indicates this network uses a VPN transport.
-    NT_VPN = 5;
+    // Indicates this network uses a VPN transport, now deprecated.
+    NT_VPN = 5 [deprecated=true];
     // Indicates this network uses a Wi-Fi Aware transport.
     NT_WIFI_AWARE = 6;
     // Indicates this network uses a LoWPAN transport.
     NT_LOWPAN = 7;
+    // Indicates this network uses a Cellular+VPN transport.
+    NT_CELLULAR_VPN = 8;
+    // Indicates this network uses a Wi-Fi+VPN transport.
+    NT_WIFI_VPN = 9;
+    // Indicates this network uses a Bluetooth+VPN transport.
+    NT_BLUETOOTH_VPN = 10;
+    // Indicates this network uses an Ethernet+VPN transport.
+    NT_ETHERNET_VPN = 11;
 }
 
 enum CacheStatus{