From 504e9b3587010d4eb54687add3976f2920b6685b Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Wed, 19 Jan 2022 15:07:06 +0000 Subject: [PATCH] [MS64] Remove subscriberId and NetworkId in proto netstats.proto is about to move into mainline module. And it can no longer see privacy.proto definition. Thus, this change remove PII data that is not very useful when debugging and any reference to privacy.proto. Test: adb bugreport and check output at transponder Bug: 204830222 Change-Id: I755530f356d2c16b336d62785c4c17c557f792db --- framework-t/src/android/net/NetworkIdentity.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/framework-t/src/android/net/NetworkIdentity.java b/framework-t/src/android/net/NetworkIdentity.java index 8f1115e065..04d1d68851 100644 --- a/framework-t/src/android/net/NetworkIdentity.java +++ b/framework-t/src/android/net/NetworkIdentity.java @@ -160,11 +160,6 @@ public class NetworkIdentity implements Comparable { // 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);