Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8ce9abd authored by Bonian Chen's avatar Bonian Chen
Browse files

[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
parent 9e3c3dd2

src/com/android/settings/network/MobileNetworkSummaryStatus.java

+5 −0
Original line number Diff line number Diff line
@@ -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<SubscriptionAnnotation> getSubscriptions(Context context) {

        return (new SelectableSubscriptions(context, true))



                // To maintain the consistency with SubscriptionUtil#getAvailableSubscriptions().

                .addFinisher(new SubscriptionGrouping())



                .call()

                .stream()

                .filter(SubscriptionAnnotation::isDisplayAllowed)