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

Commit 727f8bbf authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Add network stack proto"

parents f5bc3443 4d6fe320

cmds/statsd/src/atoms.proto

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import "frameworks/base/core/proto/android/net/networkcapabilities.proto"; 
import "frameworks/base/core/proto/android/os/enums.proto";

import "frameworks/base/core/proto/android/server/connectivity/data_stall_event.proto";

import "frameworks/base/core/proto/android/server/enums.proto";

import "frameworks/base/core/proto/android/stats/connectivity/network_stack.proto";

import "frameworks/base/core/proto/android/stats/launcher/launcher.proto";

import "frameworks/base/core/proto/android/telecomm/enums.proto";

import "frameworks/base/core/proto/android/telephony/enums.proto";
@@ -164,6 +165,7 @@ message Atom { 
        BluetoothSmpPairingEventReported bluetooth_smp_pairing_event_reported = 167;

        ProcessStartTime process_start_time = 169;

        BluetoothSocketConnectionStateChanged bluetooth_socket_connection_state_changed = 171;

        NetworkStackReported network_stack_reported = 182;

    }



    // Pulled events will start at field 10000.
@@ -3052,3 +3054,14 @@ message ProcessStartTime { 
    optional string hosting_name = 9;

}



/**

 * Push network stack events.

 *

 * Log from:

 *     frameworks/base/packages/NetworkStack/

 */

message NetworkStackReported {

    optional int32 eventId = 1;

    optional android.stats.connectivity.NetworkStackEventData network_stack_event = 2 [(log_mode) = MODE_BYTES];

}

core/proto/android/stats/connectivity/Android.bp

0 → 100644
+25 −0
Original line number Diff line number Diff line 
// Copyright (C) 2019 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



java_library_static {

    name: "networkstackprotosnano",

    proto: {

        type: "nano",

    },

    srcs: [

        "network_stack.proto",

    ],

    sdk_version: "system_current",

    no_framework_libs: true,

}
 
 No newline at end of file

core/proto/android/stats/connectivity/network_stack.proto

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";



package android.stats.connectivity;

option java_multiple_files = true;

option java_outer_classname = "NetworkStackProto";



message NetworkStackEventData {



}

packages/NetworkStack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ android_library { 
        "netd_aidl_interface-java",

        "networkstack-aidl-interfaces-java",

        "datastallprotosnano",

        "networkstackprotosnano",

    ],

    manifest: "AndroidManifestBase.xml",

}