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

Commit c6677abc authored by Steve Statia's avatar Steve Statia
Browse files

Remove usage of isSubscriptionVisible() in getSelectableSubscriptionInfoList() 

isSubscriptionVisible() API some times returns true for opportunistic subscription if the caller has carrier privileged permission. Some settings applications have this permission because they run under phone UID. Since getSelectableSubscriptionInfoList() API is very specific to settings, this CL helps settings by removing usage of isSubscriptionVisible() and directly checking for isOpportunistic()

Bug: 315955896
Test: manual atest frameworks/opt/telephony/tests/telephonytests/ all 3692 passed

Change-Id: Id4564c80ac36cd20347acffc8c824c055199024d
parent 2a8891d7

telephony/java/android/telephony/SubscriptionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3785,9 +3785,9 @@ public class SubscriptionManager { 
            Map<ParcelUuid, SubscriptionInfo> groupMap = new HashMap<>();



            for (SubscriptionInfo info : availableList) {

                // Opportunistic subscriptions are considered invisible

                // Grouped opportunistic subscriptions are considered invisible

                // to users so they should never be returned.

                if (!isSubscriptionVisible(info)) continue;

                if (info.getGroupUuid() != null && info.isOpportunistic()) continue;



                ParcelUuid groupUuid = info.getGroupUuid();

                if (groupUuid == null) {