From 1c8b991615710d3a112ccd58f819edd4c8df1ba1 Mon Sep 17 00:00:00 2001 From: Automerger Merge Worker Date: Tue, 25 Feb 2020 07:48:51 +0000 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 Merged-In: I0d106ca1631265b872386b59d542b206614f38ef Change-Id: I85d7aa69bc4a1f4a6de3f68cec1fcc3b8848e5c5 (cherry picked from commit 467962e92867c8e97f205a2d82b55f9e2d3f46b8) --- .../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 76f8f0febf59e..afd109996722a 100644 --- a/core/proto/android/stats/dnsresolver/dns_resolver.proto +++ b/core/proto/android/stats/dnsresolver/dns_resolver.proto @@ -170,12 +170,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{