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

Commit b94122d9 authored by Ahming Chen's avatar Ahming Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix normalize doesn't work on carrier template" into sc-qpr1-dev am: ae28e400 

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

Change-Id: If028ed5e3160ab3d0054ce5a8444e6d12d700e3c
parents d7b0a362 ae28e400

core/java/android/net/NetworkTemplate.java

+10 −5
Original line number Diff line number Diff line
@@ -764,8 +764,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>
@@ -780,8 +780,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.

     *
@@ -793,7 +793,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)) {