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

Commit ecb08754 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "tej-isolate-protologging" into sc-dev am: 916102b2 

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

Change-Id: I5557ffa21fce772921846d7508a0a05f82496205
parents 930b8ba6 916102b2

core/proto/android/net/networkcapabilities.proto

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