Merge "Fix proto invalid write type" am: 643462fffd (9d4ca1d6) · Commits · e / os / android_frameworks_base

ProtoLibraries.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ gensrcs {
		"&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -63,6 +64,7 @@ gensrcs {
		" $(in)",

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -78,6 +80,7 @@ gensrcs {
		java_library_host {
		name: "platformprotos",
		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -117,6 +120,7 @@ java_library {
		],
		sdk_version: "9",
		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -135,6 +139,7 @@ java_library {
		},

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		@@ -172,6 +177,7 @@ cc_defaults {
		],

		srcs: [
		":framework-connectivity-protos",
		":ipconnectivity-proto-src",
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",

core/proto/android/os/incident.proto

+1 −1

Original line number	Diff line number	Diff line
		@@ -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/dropbox.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/package.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/section.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";

		package android.os;

core/proto/android/service/netstats.proto

deleted100644 → 0

+0 −121

Original line number	Diff line number	Diff line
		/*
		* 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;
		}

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -189,14 +189,14 @@ public class NetworkIdentity {
		public void dumpDebug(ProtoOutputStream proto, long tag) {
		final long start = proto.start(tag);

		proto.write(NetworkIdentityProto.TYPE_FIELD_NUMBER, mType);
		proto.write(NetworkIdentityProto.TYPE, mType);

		// TODO: dump mRatType as well.

		proto.write(NetworkIdentityProto.ROAMING_FIELD_NUMBER, mRoaming);
		proto.write(NetworkIdentityProto.METERED_FIELD_NUMBER, mMetered);
		proto.write(NetworkIdentityProto.DEFAULT_NETWORK_FIELD_NUMBER, mDefaultNetwork);
		proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK_FIELD_NUMBER, mOemManaged);
		proto.write(NetworkIdentityProto.ROAMING, mRoaming);
		proto.write(NetworkIdentityProto.METERED, mMetered);
		proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);
		proto.write(NetworkIdentityProto.OEM_MANAGED_NETWORK, mOemManaged);

		proto.end(start);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ public class NetworkIdentitySet extends HashSet<NetworkIdentity> {
		final long start = proto.start(tag);

		for (NetworkIdentity ident : this) {
		ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES_FIELD_NUMBER);
		ident.dumpDebug(proto, NetworkIdentitySetProto.IDENTITIES);
		}

		proto.end(start);