commit bfcf6325eeed8d7dc78ce970db8a12f09785662f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 20 02:32:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 20 02:32:59 2022 +0000
tree ec872db622d7544f202f21857a43023d3142150f
parent 41fe9f7e31727f3b3420be938a963ac1b744f7a7
parent 11169e3da7e64ac59d0b38689ccd21b17458c04a

Merge "[MS64] Remove subscriberId and NetworkId in proto"

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

diff --git a/framework-t/src/android/net/NetworkIdentity.java b/framework-t/src/android/net/NetworkIdentity.java
index 8f1115e..04d1d68 100644
--- a/framework-t/src/android/net/NetworkIdentity.java
+++ b/framework-t/src/android/net/NetworkIdentity.java
@@ -160,11 +160,6 @@
 
         // 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);