[Settings] 1. Show default subId SIM page if get an intent with invalid

subId 2. Fix the hotswap UI issue

Bug: 271635200
Bug: 271347499
Test: local test
Change-Id: Iac61a211fce7bcd85da48cb291f46584cf43f5c5
This commit is contained in:
Zoey Chen
2023-03-10 04:43:17 +00:00
parent 3a4c6feb0a
commit 63978e7e52
5 changed files with 64 additions and 39 deletions

View File

@@ -688,6 +688,12 @@ public class SubscriptionUtil {
.findFirst().orElse(null);
}
public static boolean isDefaultSubscription(Context context, int subId) {
SubscriptionAnnotation subInfo = getDefaultSubscriptionSelection(
new SelectableSubscriptions(context, true).call());
return subInfo != null && subInfo.getSubscriptionId() == subId;
}
public static SubscriptionInfo getSubscriptionOrDefault(Context context, int subscriptionId) {
return getSubscription(context, subscriptionId,
(subscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) ? null : (