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

Commit 806baa23 authored by Tej Singh's avatar Tej Singh Committed by Automerger Merge Worker
Browse files

Merge changes from topic "tej_isolate_protologging" am: d5127dce am: 975acea8 

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

Change-Id: I83816cc3552e0514087258cb794953cf15789bbb
parents a06eac39 975acea8

core/proto/android/net/networkcapabilities.proto

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