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

Commit 8f252c15 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Add network stack proto"

parents 25a2987c 0e88ebfb

cmds/statsd/src/atoms.proto

+13 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import "frameworks/base/core/proto/android/server/job/enums.proto"; 
import "frameworks/base/core/proto/android/server/location/enums.proto";

import "frameworks/base/core/proto/android/service/procstats_enum.proto";

import "frameworks/base/core/proto/android/service/usb.proto";

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

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

import "frameworks/base/core/proto/android/stats/docsui/docsui_enums.proto";

import "frameworks/base/core/proto/android/stats/devicepolicy/device_policy.proto";
@@ -252,6 +253,7 @@ message Atom { 
        StyleUIChanged style_ui_changed = 179;

        PrivacyIndicatorsInteracted privacy_indicators_interacted = 180;

        AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181;

        NetworkStackReported network_stack_reported = 182;

    }



    // Pulled events will start at field 10000.
@@ -5851,3 +5853,14 @@ message SystemIonHeapSize { 
    // Size of the system ion heap in bytes.

    optional int64 size_in_bytes = 1;

}



/**

 * 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",

}