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

Commit 898e2b53 authored by Michele Berionne's avatar Michele Berionne Committed by Maria Yang
Browse files

Handle setAllowedCarriers() with empty list of carriers

Bug: 204136145
Test: unit testing
Change-Id: I9779180ff1c3e926f97e010ca6026c5fb950046d
parent 95aa9b34
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -11898,12 +11898,15 @@ public class TelephonyManager {
        if (carriers == null || !SubscriptionManager.isValidPhoneId(slotIndex)) {
            return -1;
        }
        // Execute the method setCarrierRestrictionRules with an empty excluded list and
        // indicating priority for the allowed list.
        // Execute the method setCarrierRestrictionRules with an empty excluded list.
        // If the allowed list is empty, it means that all carriers are allowed (default allowed),
        // otherwise it means that only specified carriers are allowed (default not allowed).
        CarrierRestrictionRules carrierRestrictionRules = CarrierRestrictionRules.newBuilder()
                .setAllowedCarriers(carriers)
                .setDefaultCarrierRestriction(
                    CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED)
                    carriers.isEmpty()
                        ? CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_ALLOWED
                        : CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED)
                .build();
        int result = setCarrierRestrictionRules(carrierRestrictionRules);