Merge "[MS64] Remove subscriberId and NetworkId in proto" am: 57c4d95609 am: e6a6334c3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954021 Change-Id: I6de5316b82cde19a922fdd9ea636e5eb7eae2bc1
This commit is contained in:
@@ -160,11 +160,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
|
|||||||
|
|
||||||
// Not dumping mSubType, subtypes are no longer supported.
|
// 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.ROAMING, mRoaming);
|
||||||
proto.write(NetworkIdentityProto.METERED, mMetered);
|
proto.write(NetworkIdentityProto.METERED, mMetered);
|
||||||
proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);
|
proto.write(NetworkIdentityProto.DEFAULT_NETWORK, mDefaultNetwork);
|
||||||
|
|||||||
Reference in New Issue
Block a user