Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Bonian Chen
2021-07-27 15:52:55 +08:00
parent 9e3c3dd21e
commit a8ce9abde7
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)