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 467962e928)
This commit is contained in:
Automerger Merge Worker
2020-02-25 07:48:51 +00:00
committed by Frank Li
parent ea6a210cf5
commit 1c8b991615

View File

@@ -170,12 +170,20 @@ enum NetworkType {
NT_BLUETOOTH = 3; NT_BLUETOOTH = 3;
// Indicates this network uses an Ethernet transport. // Indicates this network uses an Ethernet transport.
NT_ETHERNET = 4; NT_ETHERNET = 4;
// Indicates this network uses a VPN transport. // Indicates this network uses a VPN transport, now deprecated.
NT_VPN = 5; NT_VPN = 5 [deprecated=true];
// Indicates this network uses a Wi-Fi Aware transport. // Indicates this network uses a Wi-Fi Aware transport.
NT_WIFI_AWARE = 6; NT_WIFI_AWARE = 6;
// Indicates this network uses a LoWPAN transport. // Indicates this network uses a LoWPAN transport.
NT_LOWPAN = 7; 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{ enum CacheStatus{