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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631291

Change-Id: I8eff763b63b01f78fd36dd942dfa923d47198398
This commit is contained in:
Maria Yang
2022-01-14 06:13:41 +00:00
committed by Automerger Merge Worker
parent 2ade4ba3bb d36f3eb795
commit 976b3f65d8
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

@@ -12123,12 +12123,15 @@ public class TelephonyManager {
if (carriers == null || !SubscriptionManager.isValidPhoneId(slotIndex)) { if (carriers == null || !SubscriptionManager.isValidPhoneId(slotIndex)) {
return -1; return -1;
} }
// Execute the method setCarrierRestrictionRules with an empty excluded list and // Execute the method setCarrierRestrictionRules with an empty excluded list.
// indicating priority for the allowed 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() CarrierRestrictionRules carrierRestrictionRules = CarrierRestrictionRules.newBuilder()
.setAllowedCarriers(carriers) .setAllowedCarriers(carriers)
.setDefaultCarrierRestriction( .setDefaultCarrierRestriction(
CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED) carriers.isEmpty()
? CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_ALLOWED
: CarrierRestrictionRules.CARRIER_RESTRICTION_DEFAULT_NOT_ALLOWED)
.build(); .build();
int result = setCarrierRestrictionRules(carrierRestrictionRules); int result = setCarrierRestrictionRules(carrierRestrictionRules);