Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev

This commit is contained in:
Tom Hsu
2021-08-10 06:00:44 +00:00
committed by Android (Google) Code Review

View File

@@ -257,6 +257,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
if (currentSubInfo == null) { if (currentSubInfo == null) {
currentSubInfo = subList.stream() currentSubInfo = subList.stream()
.filter(SubscriptionAnnotation::isDisplayAllowed) .filter(SubscriptionAnnotation::isDisplayAllowed)
.filter(SubscriptionAnnotation::isActive)
.findFirst().orElse(null); .findFirst().orElse(null);
} }
return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo(); return (currentSubInfo == null) ? null : currentSubInfo.getSubInfo();