LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: Iab0ec0b6b722aeee38bcfb3328e17a040c117f50
This commit is contained in:
Treehugger Robot
2022-01-20 05:48:45 +00:00
committed by Automerger Merge Worker
parent 925f1d7f65 4fc736f508
commit 42cf9f806b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework-t/src/android/net/NetworkIdentity.java
View File

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