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

Commit d36f3eb7 authored by Maria Yang's avatar Maria Yang Committed by Android (Google) Code Review
Browse files

Merge "Handle setAllowedCarriers() with empty list of carriers" into sc-v2-dev

parents 446346bc 898e2b53
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);