Merge "[MS64] Remove subscriberId and NetworkId in proto" (0433d02a) · Commits · e / os / android_frameworks_base

core/proto/android/service/netstats.proto

+0 −30

Original line number	Diff line number	Diff line
		@@ -17,15 +17,11 @@
		syntax = "proto2";
		package android.service;

		import "frameworks/base/core/proto/android/privacy.proto";

		option java_multiple_files = true;
		option java_outer_classname = "NetworkStatsServiceProto";

		// Represents dumpsys from NetworkStatsService (netstats).
		message NetworkStatsServiceDumpProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		repeated NetworkInterfaceProto active_interfaces = 1;

		repeated NetworkInterfaceProto active_uid_interfaces = 2;
		@@ -45,8 +41,6 @@ message NetworkStatsServiceDumpProto {

		// Corresponds to NetworkStatsService.mActiveIfaces/mActiveUidIfaces.
		message NetworkInterfaceProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		// Name of the network interface (eg: wlan).
		optional string interface = 1;

		@@ -55,26 +49,14 @@ message NetworkInterfaceProto {

		// Corresponds to NetworkIdentitySet.
		message NetworkIdentitySetProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		repeated NetworkIdentityProto identities = 1;
		}

		// Corresponds to NetworkIdentity.
		message NetworkIdentityProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		// Constants from ConnectivityManager.TYPE_*.
		optional int32 type = 1;

		// Full subscriber ID on eng builds. The IMSI is scrubbed on user & userdebug
		// builds to only include the info about the GSM network operator (the info
		// that uniquely identifies the subscriber is removed).
		optional string subscriber_id = 2 [ (android.privacy).dest = DEST_EXPLICIT ];

		// Name of the network (eg: MyWifi).
		optional string network_id = 3 [ (android.privacy).dest = DEST_EXPLICIT ];

		optional bool roaming = 4;

		optional bool metered = 5;
		@@ -86,8 +68,6 @@ message NetworkIdentityProto {

		// Corresponds to NetworkStatsRecorder.
		message NetworkStatsRecorderProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		optional int64 pending_total_bytes = 1;

		optional NetworkStatsCollectionProto complete_history = 2;
		@@ -95,15 +75,11 @@ message NetworkStatsRecorderProto {

		// Corresponds to NetworkStatsCollection.
		message NetworkStatsCollectionProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		repeated NetworkStatsCollectionStatsProto stats = 1;
		}

		// Corresponds to NetworkStatsCollection.mStats.
		message NetworkStatsCollectionStatsProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		optional NetworkStatsCollectionKeyProto key = 1;

		optional NetworkStatsHistoryProto history = 2;
		@@ -111,8 +87,6 @@ message NetworkStatsCollectionStatsProto {

		// Corresponds to NetworkStatsCollection.Key.
		message NetworkStatsCollectionKeyProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		optional NetworkIdentitySetProto identity = 1;

		optional int32 uid = 2;
		@@ -124,8 +98,6 @@ message NetworkStatsCollectionKeyProto {

		// Corresponds to NetworkStatsHistory.
		message NetworkStatsHistoryProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		// Duration for this bucket in milliseconds.
		optional int64 bucket_duration_ms = 1;

		@@ -134,8 +106,6 @@ message NetworkStatsHistoryProto {

		// Corresponds to each bucket in NetworkStatsHistory.
		message NetworkStatsHistoryBucketProto {
		option (android.msg_privacy).dest = DEST_AUTOMATIC;

		// Bucket start time in milliseconds since epoch.
		optional int64 bucket_start_ms = 1;

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -160,11 +160,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {

		// Not dumping mSubType, subtypes are no longer supported.

		if (mSubscriberId != null) {
		proto.write(NetworkIdentityProto.SUBSCRIBER_ID,
		NetworkIdentityUtils.scrubSubscriberId(mSubscriberId));
		}
		proto.write(NetworkIdentityProto.NETWORK_ID, mNetworkId);
		proto.write(NetworkIdentityProto.ROAMING, mRoaming);
		proto.write(NetworkIdentityProto.METERED, mMetered);
		proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);