Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "tej_isolate_protologging" am: d5127dceb0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639879

Change-Id: Ibb3c5666ff965737ced284d548345b45ef50a2ce
This commit is contained in:
Tej Singh
2021-03-19 22:41:51 +00:00
committed by Automerger Merge Worker
parent 4235756ab9 d5127dceb0
commit 975acea8a5
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/proto/android/net/networkcapabilities.proto
View File

@@ -21,6 +21,7 @@ package android.net;
option java_multiple_files = true; option java_multiple_files = true;
import "frameworks/base/core/proto/android/privacy.proto"; import "frameworks/base/core/proto/android/privacy.proto";
import "frameworks/proto_logging/stats/enums/net/enums.proto";
/** /**
* An android.net.NetworkCapabilities object. * An android.net.NetworkCapabilities object.
@@ -28,22 +29,6 @@ import "frameworks/base/core/proto/android/privacy.proto";
message NetworkCapabilitiesProto { message NetworkCapabilitiesProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC; 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; repeated Transport transports = 1;
enum NetCapability { enum NetCapability {