Merge "[MS64] Remove subscriberId and NetworkId in proto" am: 57c4d95609 am: e6a6334c3c am: 4fc736f508 am: 42cf9f806b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954021

Change-Id: Ie7dcf065cd794284dc2c49b5073e6e3012aeec2a
This commit is contained in:
Treehugger Robot
2022-01-20 06:09:54 +00:00
committed by Automerger Merge Worker

View File

@@ -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);