Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix proto invalid write type"

Browse Source
This commit is contained in:
Aaron Huang
2022-03-22 12:18:39 +00:00
committed by Gerrit Code Review
parent 49c0c87c79 623fe199f7
commit 643462fffd
9 changed files with 38 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProtoLibraries.bp
View File

@@ -33,6 +33,7 @@ gensrcs {
"&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)", "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -63,6 +64,7 @@ gensrcs {
" $(in)", " $(in)",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -78,6 +80,7 @@ gensrcs {
java_library_host { java_library_host {
name: "platformprotos", name: "platformprotos",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -117,6 +120,7 @@ java_library {
], ],
sdk_version: "9", sdk_version: "9",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -135,6 +139,7 @@ java_library {
}, },
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -172,6 +177,7 @@ cc_defaults {
], ],
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",

2
core/proto/android/os/incident.proto
View File

@@ -48,7 +48,6 @@ import "frameworks/base/core/proto/android/service/batterystats.proto";
import "frameworks/base/core/proto/android/service/diskstats.proto"; import "frameworks/base/core/proto/android/service/diskstats.proto";
import "frameworks/base/core/proto/android/service/dropbox.proto"; import "frameworks/base/core/proto/android/service/dropbox.proto";
import "frameworks/base/core/proto/android/service/graphicsstats.proto"; import "frameworks/base/core/proto/android/service/graphicsstats.proto";
import "frameworks/base/core/proto/android/service/netstats.proto";
import "frameworks/base/core/proto/android/service/notification.proto"; import "frameworks/base/core/proto/android/service/notification.proto";
import "frameworks/base/core/proto/android/service/package.proto"; import "frameworks/base/core/proto/android/service/package.proto";
import "frameworks/base/core/proto/android/service/print.proto"; import "frameworks/base/core/proto/android/service/print.proto";
@@ -62,6 +61,7 @@ import "frameworks/base/core/proto/android/util/textdump.proto";
import "frameworks/base/core/proto/android/privacy.proto"; import "frameworks/base/core/proto/android/privacy.proto";
import "frameworks/base/core/proto/android/section.proto"; import "frameworks/base/core/proto/android/section.proto";
import "frameworks/base/proto/src/ipconnectivity.proto"; import "frameworks/base/proto/src/ipconnectivity.proto";
import "packages/modules/Connectivity/framework/proto/netstats.proto";
import "packages/modules/Permission/service/proto/com/android/role/roleservice.proto"; import "packages/modules/Permission/service/proto/com/android/role/roleservice.proto";
package android.os; package android.os;

121
core/proto/android/service/netstats.proto
View File

@@ -1,121 +0,0 @@
/*
* Copyright (C) 2017 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.service;
option java_multiple_files = true;
option java_outer_classname = "NetworkStatsServiceProto";
// Represents dumpsys from NetworkStatsService (netstats).
message NetworkStatsServiceDumpProto {
repeated NetworkInterfaceProto active_interfaces = 1;
repeated NetworkInterfaceProto active_uid_interfaces = 2;
// Device level network stats, which may include non-IP layer traffic.
optional NetworkStatsRecorderProto dev_stats = 3;
// IP-layer traffic stats.
optional NetworkStatsRecorderProto xt_stats = 4;
// Per-UID network stats.
optional NetworkStatsRecorderProto uid_stats = 5;
// Per-UID, per-tag network stats, excluding the default tag (i.e. tag=0).
optional NetworkStatsRecorderProto uid_tag_stats = 6;
}
// Corresponds to NetworkStatsService.mActiveIfaces/mActiveUidIfaces.
message NetworkInterfaceProto {
// Name of the network interface (eg: wlan).
optional string interface = 1;
optional NetworkIdentitySetProto identities = 2;
}
// Corresponds to NetworkIdentitySet.
message NetworkIdentitySetProto {
repeated NetworkIdentityProto identities = 1;
}
// Corresponds to NetworkIdentity.
message NetworkIdentityProto {
// Constants from ConnectivityManager.TYPE_*.
optional int32 type = 1;
optional bool roaming = 4;
optional bool metered = 5;
optional bool default_network = 6;
optional int32 oem_managed_network = 7;
}
// Corresponds to NetworkStatsRecorder.
message NetworkStatsRecorderProto {
optional int64 pending_total_bytes = 1;
optional NetworkStatsCollectionProto complete_history = 2;
}
// Corresponds to NetworkStatsCollection.
message NetworkStatsCollectionProto {
repeated NetworkStatsCollectionStatsProto stats = 1;
}
// Corresponds to NetworkStatsCollection.mStats.
message NetworkStatsCollectionStatsProto {
optional NetworkStatsCollectionKeyProto key = 1;
optional NetworkStatsHistoryProto history = 2;
}
// Corresponds to NetworkStatsCollection.Key.
message NetworkStatsCollectionKeyProto {
optional NetworkIdentitySetProto identity = 1;
optional int32 uid = 2;
optional int32 set = 3;
optional int32 tag = 4;
}
// Corresponds to NetworkStatsHistory.
message NetworkStatsHistoryProto {
// Duration for this bucket in milliseconds.
optional int64 bucket_duration_ms = 1;
repeated NetworkStatsHistoryBucketProto buckets = 2;
}
// Corresponds to each bucket in NetworkStatsHistory.
message NetworkStatsHistoryBucketProto {
// Bucket start time in milliseconds since epoch.
optional int64 bucket_start_ms = 1;
optional int64 rx_bytes = 2;
optional int64 rx_packets = 3;
optional int64 tx_bytes = 4;
optional int64 tx_packets = 5;
optional int64 operations = 6;
}

10
packages/ConnectivityT/framework-t/src/android/net/NetworkIdentity.java
View File

@@ -189,14 +189,14 @@ public class NetworkIdentity {
public void dumpDebug(ProtoOutputStream proto, long tag) { public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag); final long start = proto.start(tag);
proto.write(NetworkIdentityProto.TYPE_FIELD_NUMBER, mType); proto.write(NetworkIdentityProto.TYPE, mType);
// TODO: dump mRatType as well. // TODO: dump mRatType as well.
proto.write(NetworkIdentityProto.ROAMING_FIELD_NUMBER, mRoaming); proto.write(NetworkIdentityProto.ROAMING, mRoaming);
proto.write(NetworkIdentityProto.METERED_FIELD_NUMBER, mMetered); proto.write(NetworkIdentityProto.METERED, mMetered);
proto.write(NetworkIdentityProto.DEFAULT_NETWORK_FIELD_NUMBER, mDefaultNetwork); proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);
proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK_FIELD_NUMBER, mOemManaged); proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK, mOemManaged);
proto.end(start); proto.end(start);
} }

2
packages/ConnectivityT/framework-t/src/android/net/NetworkIdentitySet.java
View File

@@ -222,7 +222,7 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
final long start = proto.start(tag); final long start = proto.start(tag);
for (NetworkIdentity ident : this) { for (NetworkIdentity ident : this) {
ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES_FIELD_NUMBER); ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES);
} }
proto.end(start); proto.end(start);

14
packages/ConnectivityT/framework-t/src/android/net/NetworkStatsCollection.java
View File

@@ -733,19 +733,19 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
final long start = proto.start(tag); final long start = proto.start(tag);
for (Key key : getSortedKeys()) { for (Key key : getSortedKeys()) {
final long startStats = proto.start(NetworkStatsCollectionProto.STATS_FIELD_NUMBER); final long startStats = proto.start(NetworkStatsCollectionProto.STATS);
// Key // Key
final long startKey = proto.start(NetworkStatsCollectionStatsProto.KEY_FIELD_NUMBER); final long startKey = proto.start(NetworkStatsCollectionStatsProto.KEY);
key.ident.dumpDebug(proto, NetworkStatsCollectionKeyProto.IDENTITY_FIELD_NUMBER); key.ident.dumpDebug(proto, NetworkStatsCollectionKeyProto.IDENTITY);
proto.write(NetworkStatsCollectionKeyProto.UID_FIELD_NUMBER, key.uid); proto.write(NetworkStatsCollectionKeyProto.UID, key.uid);
proto.write(NetworkStatsCollectionKeyProto.SET_FIELD_NUMBER, key.set); proto.write(NetworkStatsCollectionKeyProto.SET, key.set);
proto.write(NetworkStatsCollectionKeyProto.TAG_FIELD_NUMBER, key.tag); proto.write(NetworkStatsCollectionKeyProto.TAG, key.tag);
proto.end(startKey); proto.end(startKey);
// Value // Value
final NetworkStatsHistory history = mStats.get(key); final NetworkStatsHistory history = mStats.get(key);
history.dumpDebug(proto, NetworkStatsCollectionStatsProto.HISTORY_FIELD_NUMBER); history.dumpDebug(proto, NetworkStatsCollectionStatsProto.HISTORY);
proto.end(startStats); proto.end(startStats);
} }

16
packages/ConnectivityT/framework-t/src/android/net/NetworkStatsHistory.java
View File

@@ -915,18 +915,18 @@ public final class NetworkStatsHistory implements Parcelable {
public void dumpDebug(ProtoOutputStream proto, long tag) { public void dumpDebug(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag); final long start = proto.start(tag);
proto.write(NetworkStatsHistoryProto.BUCKET_DURATION_MS_FIELD_NUMBER, bucketDuration); proto.write(NetworkStatsHistoryProto.BUCKET_DURATION_MS, bucketDuration);
for (int i = 0; i < bucketCount; i++) { for (int i = 0; i < bucketCount; i++) {
final long startBucket = proto.start(NetworkStatsHistoryProto.BUCKETS_FIELD_NUMBER); final long startBucket = proto.start(NetworkStatsHistoryProto.BUCKETS);
proto.write(NetworkStatsHistoryBucketProto.BUCKET_START_MS_FIELD_NUMBER, proto.write(NetworkStatsHistoryBucketProto.BUCKET_START_MS,
bucketStart[i]); bucketStart[i]);
dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_BYTES_FIELD_NUMBER, rxBytes, i); dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_BYTES, rxBytes, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_PACKETS_FIELD_NUMBER, rxPackets, i); dumpDebug(proto, NetworkStatsHistoryBucketProto.RX_PACKETS, rxPackets, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_BYTES_FIELD_NUMBER, txBytes, i); dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_BYTES, txBytes, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_PACKETS_FIELD_NUMBER, txPackets, i); dumpDebug(proto, NetworkStatsHistoryBucketProto.TX_PACKETS, txPackets, i);
dumpDebug(proto, NetworkStatsHistoryBucketProto.OPERATIONS_FIELD_NUMBER, operations, i); dumpDebug(proto, NetworkStatsHistoryBucketProto.OPERATIONS, operations, i);
proto.end(startBucket); proto.end(startBucket);
} }

4
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsRecorder.java
View File

@@ -471,11 +471,11 @@ public class NetworkStatsRecorder {
public void dumpDebugLocked(ProtoOutputStream proto, long tag) { public void dumpDebugLocked(ProtoOutputStream proto, long tag) {
final long start = proto.start(tag); final long start = proto.start(tag);
if (mPending != null) { if (mPending != null) {
proto.write(NetworkStatsRecorderProto.PENDING_TOTAL_BYTES_FIELD_NUMBER, proto.write(NetworkStatsRecorderProto.PENDING_TOTAL_BYTES,
mPending.getTotalBytes()); mPending.getTotalBytes());
} }
getOrLoadCompleteLocked().dumpDebug(proto, getOrLoadCompleteLocked().dumpDebug(proto,
NetworkStatsRecorderProto.COMPLETE_HISTORY_FIELD_NUMBER); NetworkStatsRecorderProto.COMPLETE_HISTORY);
proto.end(start); proto.end(start);
} }

16
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
View File

@@ -2132,15 +2132,15 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// TODO Right now it writes all history. Should it limit to the "since-boot" log? // TODO Right now it writes all history. Should it limit to the "since-boot" log?
dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_INTERFACES_FIELD_NUMBER, dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_INTERFACES,
mActiveIfaces); mActiveIfaces);
dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_UID_INTERFACES_FIELD_NUMBER, dumpInterfaces(proto, NetworkStatsServiceDumpProto.ACTIVE_UID_INTERFACES,
mActiveUidIfaces); mActiveUidIfaces);
mDevRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.DEV_STATS_FIELD_NUMBER); mDevRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.DEV_STATS);
mXtRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.XT_STATS_FIELD_NUMBER); mXtRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.XT_STATS);
mUidRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_STATS_FIELD_NUMBER); mUidRecorder.dumpDebugLocked(proto, NetworkStatsServiceDumpProto.UID_STATS);
mUidTagRecorder.dumpDebugLocked(proto, mUidTagRecorder.dumpDebugLocked(proto,
NetworkStatsServiceDumpProto.UID_TAG_STATS_FIELD_NUMBER); NetworkStatsServiceDumpProto.UID_TAG_STATS);
proto.flush(); proto.flush();
} }
@@ -2150,8 +2150,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
for (int i = 0; i < ifaces.size(); i++) { for (int i = 0; i < ifaces.size(); i++) {
final long start = proto.start(tag); final long start = proto.start(tag);
proto.write(NetworkInterfaceProto.INTERFACE_FIELD_NUMBER, ifaces.keyAt(i)); proto.write(NetworkInterfaceProto.INTERFACE, ifaces.keyAt(i));
ifaces.valueAt(i).dumpDebug(proto, NetworkInterfaceProto.IDENTITIES_FIELD_NUMBER); ifaces.valueAt(i).dumpDebug(proto, NetworkInterfaceProto.IDENTITIES);
proto.end(start); proto.end(start);
} }