commit 1f788606a08b5c74bdc41350592ab20f41959d13
author lifr <lifr@google.com> Thu Nov 18 02:37:28 2021 +0800
committer Frank <lifr@google.com> Thu Feb 10 22:51:56 2022 +0800
tree 14a05aef18659d46d1c90ab73900b0c3c467b010
parent cc7f866d95b14f0d4c297a9be77f3ded9b3a15aa

[SUBID01-1]Grow NetworkIdentity to include a new mSubId field

In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.

This commit adds NetworkStats support for subscriberId as a part of
the network identity key

Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsServiceTest NetworkIdentityTest
Ignore-AOSP-First: merge conflict resolutions
Change-Id: I8549b11d0fcfc5a9426724d6b90de27b707cb77c

framework-t/api/module-lib-current.txt

diff --git a/framework-t/api/module-lib-current.txt b/framework-t/api/module-lib-current.txt
index b284d4f..0f0c971 100644
--- a/framework-t/api/module-lib-current.txt
+++ b/framework-t/api/module-lib-current.txt
@@ -42,6 +42,7 @@
   public class NetworkIdentity {
     method public int getOemManaged();
     method public int getRatType();
+    method public int getSubId();
     method @Nullable public String getSubscriberId();
     method public int getType();
     method @Nullable public String getWifiNetworkKey();
@@ -60,6 +61,7 @@
     method @NonNull public android.net.NetworkIdentity.Builder setOemManaged(int);
     method @NonNull public android.net.NetworkIdentity.Builder setRatType(int);
     method @NonNull public android.net.NetworkIdentity.Builder setRoaming(boolean);
+    method @NonNull public android.net.NetworkIdentity.Builder setSubId(int);
     method @NonNull public android.net.NetworkIdentity.Builder setSubscriberId(@Nullable String);
     method @NonNull public android.net.NetworkIdentity.Builder setType(int);
     method @NonNull public android.net.NetworkIdentity.Builder setWifiNetworkKey(@Nullable String);
@@ -72,7 +74,8 @@
     method @NonNull public android.net.LinkProperties getLinkProperties();
     method @NonNull public android.net.Network getNetwork();
     method @NonNull public android.net.NetworkCapabilities getNetworkCapabilities();
-    method @Nullable public String getSubscriberId();
+    method public int getSubId();
+    method @Deprecated @Nullable public String getSubscriberId();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStateSnapshot> CREATOR;
   }