PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bonian Chen
2021-07-27 12:09:34 +00:00
committed by Android (Google) Code Review
parent 2f8d8405bf a8ce9abde7
commit 3e839e0aef
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/MobileNetworkSummaryStatus.java
View File

@@ -23,6 +23,7 @@ import android.util.Log;
import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.helper.SelectableSubscriptions; import com.android.settings.network.helper.SelectableSubscriptions;
import com.android.settings.network.helper.SubscriptionAnnotation; import com.android.settings.network.helper.SubscriptionAnnotation;
import com.android.settings.network.helper.SubscriptionGrouping;
import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settingslib.utils.ThreadUtils; import com.android.settingslib.utils.ThreadUtils;
@@ -150,6 +151,10 @@ public class MobileNetworkSummaryStatus {
private List<SubscriptionAnnotation> getSubscriptions(Context context) { private List<SubscriptionAnnotation> getSubscriptions(Context context) {
return (new SelectableSubscriptions(context, true)) return (new SelectableSubscriptions(context, true))
// To maintain the consistency with SubscriptionUtil#getAvailableSubscriptions().
.addFinisher(new SubscriptionGrouping())
.call() .call()
.stream() .stream()
.filter(SubscriptionAnnotation::isDisplayAllowed) .filter(SubscriptionAnnotation::isDisplayAllowed)