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

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

Change-Id: Id942def631ce2476267040245196e258a84e6f3c
This commit is contained in:
Tom Hsu
2021-08-10 06:35:22 +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();