Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced462a3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "ADD new enum NetworkType to identify multiple transport type" am: b4562568 

Change-Id: I6139c33252cae0a9b041fe3b47e12ceadfe6367f
parents a081a0cb b4562568

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

+10 −2
Original line number Diff line number Diff line
@@ -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{