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

Merge cherrypicks of [16065658, 16033980, 16105251, 16117045, 16086468, 15960214, 16077739, 16211938, 16222839, 16191693, 16091135, 16220980, 16214442, 16233501, 16286398, 16333337] into sc-qpr1-release.

Browse Source 
Change-Id: I961e3b46e89863311915418d1d4b092d7d970d0e
This commit is contained in:
Android Build Coastguard Worker
2021-11-24 23:26:08 +00:00
parent f5ddb61923 1acacc8f86
commit 8f74b92285
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/NetworkTemplate.java
View File

@@ -782,8 +782,8 @@ public class NetworkTemplate implements Parcelable {
} }
/** /**
* Examine the given template and normalize if it refers to a "merged" * Examine the given template and normalize it.
* mobile subscriber. We pick the "lowest" merged subscriber as the primary * We pick the "lowest" merged subscriber as the primary
* for key purposes, and expand the template to match all other merged * for key purposes, and expand the template to match all other merged
* subscribers. * subscribers.
* <p> * <p>
@@ -798,8 +798,8 @@ public class NetworkTemplate implements Parcelable {
} }
/** /**
* Examine the given template and normalize if it refers to a "merged" * Examine the given template and normalize it.
* mobile subscriber. We pick the "lowest" merged subscriber as the primary * We pick the "lowest" merged subscriber as the primary
* for key purposes, and expand the template to match all other merged * for key purposes, and expand the template to match all other merged
* subscribers. * subscribers.
* *
@@ -811,7 +811,12 @@ public class NetworkTemplate implements Parcelable {
* A, but also matches B. * A, but also matches B.
*/ */
public static NetworkTemplate normalize(NetworkTemplate template, List<String[]> mergedList) { public static NetworkTemplate normalize(NetworkTemplate template, List<String[]> mergedList) {
if (!template.isMatchRuleMobile()) return template; // Now there are several types of network which uses SubscriberId to store network
// information. For instances:
// The TYPE_WIFI with subscriberId means that it is a merged carrier wifi network.
// The TYPE_CARRIER means that the network associate to specific carrier network.
if (template.mSubscriberId == null) return template;
for (String[] merged : mergedList) { for (String[] merged : mergedList) {
if (ArrayUtils.contains(merged, template.mSubscriberId)) { if (ArrayUtils.contains(merged, template.mSubscriberId)) {