From 80d273e43da6b3c1281a72f673da1322adf9cc6e Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Tue, 16 Mar 2021 01:32:25 -0700 Subject: Remove network transport from core/proto Move the network transport type to proto_logging. It is needed in atoms.proto, and all atoms.proto dependencies should live in proto_logging. Previously, networkcapabilities.proto was in proto_logging, but the majority of that proto is not needed for logging and is used for incident reports. Test: m Bug: 182392879 Change-Id: I24ff96806e417ad4ee89d84f051ea790a416338f Merged-In: I24ff96806e417ad4ee89d84f051ea790a416338f --- core/proto/android/net/networkcapabilities.proto | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'core') diff --git a/core/proto/android/net/networkcapabilities.proto b/core/proto/android/net/networkcapabilities.proto index be0cad18a24d..edb6c0400062 100644 --- a/core/proto/android/net/networkcapabilities.proto +++ b/core/proto/android/net/networkcapabilities.proto @@ -21,6 +21,7 @@ package android.net; option java_multiple_files = true; import "frameworks/base/core/proto/android/privacy.proto"; +import "frameworks/proto_logging/stats/enums/net/enums.proto"; /** * An android.net.NetworkCapabilities object. @@ -28,22 +29,6 @@ import "frameworks/base/core/proto/android/privacy.proto"; message NetworkCapabilitiesProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - enum Transport { - // Indicates this network uses a Cellular transport. - TRANSPORT_CELLULAR = 0; - // Indicates this network uses a Wi-Fi transport. - TRANSPORT_WIFI = 1; - // Indicates this network uses a Bluetooth transport. - TRANSPORT_BLUETOOTH = 2; - // Indicates this network uses an Ethernet transport. - TRANSPORT_ETHERNET = 3; - // Indicates this network uses a VPN transport. - TRANSPORT_VPN = 4; - // Indicates this network uses a Wi-Fi Aware transport. - TRANSPORT_WIFI_AWARE = 5; - // Indicates this network uses a LoWPAN transport. - TRANSPORT_LOWPAN = 6; - } repeated Transport transports = 1; enum NetCapability { -- cgit v1.2.3