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

Fix normalize doesn't work on carrier template

Browse Source 
From android 12, the subscriberId is being used for different network
types. For instances:
The TYPE_WIFI with subscriberId means that it is a merged wifi network.
The TYPE_CARRIER means that the network associate to specific carrier
network (subscriberId).

So remove the check "isMatchRuleMobile" and only check whether subscriberId
is being used in NetworkTemplate or not.

Bug: 194939211
Test: atest -c NetworkTemplateTest
Change-Id: I80c9f887cf8b4714716d657da92ed273a532ce27
Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27
(cherry picked from commit 46cc261aa90305bdfec668af5d5ed25a27032cda)
Merged-In:I80c9f887cf8b4714716d657da92ed273a532ce27
This commit is contained in:
Les Lee
2021-11-03 19:57:54 +08:00
committed by Android Build Coastguard Worker
parent f5ddb61923
commit 1acacc8f86
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)) {