Commit b1997b78 authored Apr 02, 2020 by Frank Li Committed by Automerger Merge Worker Apr 02, 2020

Merge "Add new NetworkType for WIFI+CELLULAR+VPN transport" am: abc516b9 am:...

Merge "Add new NetworkType for WIFI+CELLULAR+VPN transport" am: abc516b9 am: 6ae6d9d1 am: 1bee9993 am: 52cddf91 am: eb25000e

Change-Id: I4575b912db7457e0e0c1dea4d1af07389a4cf394

parents 1bad3481 eb25000e

core/proto/android/stats/dnsresolver/dns_resolver.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -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{