Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a42b6bff authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "Fix normalize doesn't work on carrier template" am: a1e47b65 

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

Change-Id: I955970137e916ab402c3a81a6656a22cc5c45c99
parents 83da6cfd a1e47b65

core/java/android/net/NetworkTemplate.java

+10 −5
Original line number Diff line number Diff line
@@ -777,8 +777,8 @@ public class NetworkTemplate implements Parcelable { 
    }



    /**

     * Examine the given template and normalize if it refers to a "merged"

     * mobile subscriber. We pick the "lowest" merged subscriber as the primary

     * Examine the given template and normalize it.

     * We pick the "lowest" merged subscriber as the primary

     * for key purposes, and expand the template to match all other merged

     * subscribers.

     * <p>
@@ -793,8 +793,8 @@ public class NetworkTemplate implements Parcelable { 
    }



    /**

     * Examine the given template and normalize if it refers to a "merged"

     * mobile subscriber. We pick the "lowest" merged subscriber as the primary

     * Examine the given template and normalize it.

     * We pick the "lowest" merged subscriber as the primary

     * for key purposes, and expand the template to match all other merged

     * subscribers.

     *
@@ -806,7 +806,12 @@ public class NetworkTemplate implements Parcelable { 
     * A, but also matches B.

     */

    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) {

            if (ArrayUtils.contains(merged, template.mSubscriberId)) {