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

Commit e5cffdb8 authored by Tej Singh's avatar Tej Singh
Browse files

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
parent 51cffe52

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 {