Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle setAllowedCarriers() with empty list of carriers

Browse Source 
Bug: 204136145
Test: unit testing
Merged-In: I9779180ff1c3e926f97e010ca6026c5fb950046d
Change-Id: I9779180ff1c3e926f97e010ca6026c5fb950046d
(cherry picked from commit 898e2b53a7)
This commit is contained in:
Michele Berionne
2022-01-12 22:37:44 +00:00
parent a31dc6da2a
commit 47ceccd912
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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);