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

Commit ddb075ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle setAllowedCarriers() with empty list of carriers" am: 74dd8497

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

Change-Id: I72315e502682b9e14d5baf9b01521a47820f198e
parents 3e537e67 74dd8497
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -12111,12 +12111,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);