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

Commit 14dde50c authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Don't show hidden Cellular subscription in Settings. 

Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
parent de324b9b

src/com/android/settings/ResetNetwork.java

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ public class ResetNetwork extends InstrumentedFragment { 
        mEsimContainer = mContentView.findViewById(R.id.erase_esim_container);

        mEsimCheckbox = mContentView.findViewById(R.id.erase_esim);



        mSubscriptions = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();

        mSubscriptions = SubscriptionManager.from(getActivity())

                .getActiveSubscriptionInfoList(true);

        if (mSubscriptions != null && mSubscriptions.size() > 0) {

            // Get the default subscription in the order of data, voice, sms, first up.

            int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();

src/com/android/settings/datausage/CellDataPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ public class CellDataPreference extends CustomDialogPreferenceCompat implements 
    }



    private void disableDataForOtherSubscriptions(int subId) {

        List<SubscriptionInfo> subInfoList = mSubscriptionManager.getActiveSubscriptionInfoList();

        List<SubscriptionInfo> subInfoList = mSubscriptionManager

                .getActiveSubscriptionInfoList(true);

        if (subInfoList != null) {

            for (SubscriptionInfo subInfo : subInfoList) {

                if (subInfo.getSubscriptionId() != subId) {

src/com/android/settings/datausage/DataUsageUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public final class DataUsageUtils { 
            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");

        }

        final List<SubscriptionInfo> subInfoList =

            SubscriptionManager.from(context).getActiveSubscriptionInfoList();

            SubscriptionManager.from(context).getActiveSubscriptionInfoList(true);

        // No activated Subscriptions

        if (subInfoList == null) {

            if (LOGD) {

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController im 


    private CharSequence getFirstPhoneNumber() {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList();

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

        if (subscriptionInfoList == null) {

            return mContext.getText(R.string.device_info_default);

        }
@@ -138,7 +138,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController im 
    @VisibleForTesting

    SubscriptionInfo getSubscriptionInfo(int simSlot) {

        final List<SubscriptionInfo> subscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList();

                mSubscriptionManager.getActiveSubscriptionInfoList(true);

        if (subscriptionInfoList != null) {

            for (SubscriptionInfo info : subscriptionInfoList) {

                if (info.getSimSlotIndex() == simSlot) {

src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class ImeiInfoDialogController { 


    private SubscriptionInfo getSubscriptionInfo(Context context, int slotId) {

        final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(context)

                .getActiveSubscriptionInfoList();

                .getActiveSubscriptionInfoList(true);

        if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {

            return null;

        }