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

Commit 3e839e0a authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] SIM summary subtitle display "null" when Fi SIM"

parents 2f8d8405 a8ce9abd

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)