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

Commit 4bdcc9fc authored by Sarah Chin's avatar Sarah Chin
Browse files

Update getNetworkTypes() call 

Test: atest SubscriptionManagerTest, DcTrackerTest
Bug: 1480218045
Change-Id: Ibeec032a4865912784bec9e46f5efbd2880351a0
Merged-In: Ibeec032a4865912784bec9e46f5efbd2880351a0
parent ed894ac1

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+11 −8
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ import java.util.concurrent.atomic.AtomicInteger; 
import java.util.concurrent.atomic.AtomicReference;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

import java.util.stream.IntStream;

import java.util.stream.Collectors;



/**

 * {@hide}
@@ -4143,24 +4143,27 @@ public class DcTracker extends Handler { 
        }



        boolean isGeneralUnmetered = true;

        Set<Integer> allNetworkTypes = Arrays.stream(TelephonyManager.getAllNetworkTypes())

                .boxed().collect(Collectors.toSet());

        for (SubscriptionPlan plan : mSubscriptionPlans) {

            // check plan is general or specific

            if (plan.getNetworkTypes() == null) {

            // check plan is general (applies to all network types) or specific

            if (Arrays.stream(plan.getNetworkTypes()).boxed().collect(Collectors.toSet())

                    .containsAll(allNetworkTypes)) {

                if (!isPlanUnmetered(plan)) {

                    // metered takes precedence over unmetered for safety

                    isGeneralUnmetered = false;

                }

            } else {

                // check plan applies to given network type

                if (IntStream.of(plan.getNetworkTypes()).anyMatch(n -> n == networkType)) {

                    // ensure network type unknown returns general value

                if (networkType != TelephonyManager.NETWORK_TYPE_UNKNOWN) {

                        // there is only 1 specific plan per network type, so return value if found

                    for (int planNetworkType : plan.getNetworkTypes()) {

                        if (planNetworkType == networkType) {

                            return isPlanUnmetered(plan);

                        }

                    }

                }

            }

        }

        return isGeneralUnmetered;

    }

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -1820,7 +1820,6 @@ public class DcTrackerTest extends TelephonyTest { 
            plans.add(SubscriptionPlan.Builder

                    .createRecurring(ZonedDateTime.parse("2007-03-14T00:00:00.000Z"),

                            Period.ofMonths(1))

                    .setTitle("Some NR 5G unmetered workaround plan")

                    .setDataLimit(SubscriptionPlan.BYTES_UNLIMITED,

                            SubscriptionPlan.LIMIT_BEHAVIOR_THROTTLED)

                    .setNetworkTypes(new int[] {TelephonyManager.NETWORK_TYPE_NR})
@@ -1829,7 +1828,6 @@ public class DcTrackerTest extends TelephonyTest { 
        plans.add(SubscriptionPlan.Builder

                .createRecurring(ZonedDateTime.parse("2007-03-14T00:00:00.000Z"),

                        Period.ofMonths(1))

                .setTitle("Some 5GB Plan")

                .setDataLimit(1_000_000_000, SubscriptionPlan.LIMIT_BEHAVIOR_DISABLED)

                .setDataUsage(500_000_000, System.currentTimeMillis())

                .build());