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 am: 976b3f65d8

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

Change-Id: I524f5fb71692bd192e082abd7e421ee880c7c688
This commit is contained in:
Maria Yang
2022-01-14 06:25:06 +00:00
committed by Automerger Merge Worker
parent 8025d76ee8 976b3f65d8
commit 95b2b8fab7
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

@@ -12615,12 +12615,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);