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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I09932874d5c45b1570d0fd83a8f8b1aad4b43108
This commit is contained in:
Tom Hsu
2021-08-10 06:12:23 +00:00
committed by Automerger Merge Worker

View File

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