Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field" am: 8039c85336

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895196

Change-Id: I708e1b7db095cbe7c505ea81af64e712bebc6a33
This commit is contained in:
Frank Li
2022-03-02 12:55:30 +00:00
committed by Automerger Merge Worker
5 changed files with 51 additions and 13 deletions

View File

@@ -78,6 +78,7 @@ public class NetworkStatsObserversTest {
private static final String IMSI_1 = "310004";
private static final String IMSI_2 = "310260";
private static final int SUBID_1 = 1;
private static final String TEST_SSID = "AndroidAP";
private static NetworkTemplate sTemplateWifi = buildTemplateWifiWildcard();
@@ -224,7 +225,7 @@ public class NetworkStatsObserversTest {
identSet.add(new NetworkIdentity(
TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_UNKNOWN,
IMSI_1, null /* networkId */, false /* roaming */, true /* metered */,
true /* defaultNetwork */, OEM_NONE));
true /* defaultNetwork */, OEM_NONE, SUBID_1));
return identSet;
}