From a8ce9abde706496078380a56268ab636f1bad881 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Tue, 27 Jul 2021 15:52:55 +0800 Subject: [PATCH] [Settings] SIM summary subtitle display "null" when Fi SIM This is a case where two Fi SIM are within device. Try to aggregate them when they got same group UUID. Bug: 194761536 Test: local Change-Id: I669e65dba6b5508f8cde88695f45eb459cd29474 --- .../android/settings/network/MobileNetworkSummaryStatus.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/network/MobileNetworkSummaryStatus.java b/src/com/android/settings/network/MobileNetworkSummaryStatus.java index 6e9c283090a..b22e48ed021 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryStatus.java +++ b/src/com/android/settings/network/MobileNetworkSummaryStatus.java @@ -23,6 +23,7 @@ import android.util.Log; import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.helper.SelectableSubscriptions; import com.android.settings.network.helper.SubscriptionAnnotation; +import com.android.settings.network.helper.SubscriptionGrouping; import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settingslib.utils.ThreadUtils; @@ -150,6 +151,10 @@ public class MobileNetworkSummaryStatus { private List getSubscriptions(Context context) { return (new SelectableSubscriptions(context, true)) + + // To maintain the consistency with SubscriptionUtil#getAvailableSubscriptions(). + .addFinisher(new SubscriptionGrouping()) + .call() .stream() .filter(SubscriptionAnnotation::isDisplayAllowed)