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

Commit c70bde09 authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

The carrier name is wrong in the dialog am: f513452d 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063557



Change-Id: I3582f4af795152245bcb57b08550e3e994cb0853
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4b95990 f513452d

src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java

+10 −7
Original line number Diff line number Diff line
@@ -88,10 +88,11 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple 
        if (subInfos == null || dds == null) {

            return null;

        }

        return subInfos.stream().filter(subinfo -> subinfo != dds).findFirst().orElse(null);

        return subInfos.stream().filter(subinfo -> subinfo.getSubscriptionId()

                != dds.getSubscriptionId()).findFirst().orElse(null);

    }



    private SubscriptionInfo getDefaultDataSubId() {

    private SubscriptionInfo getDefaultDataSubInfo() {

        return getSubscriptionManager().getDefaultDataSubscriptionInfo();

    }
@@ -101,20 +102,22 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple 
            return;

        }



        SubscriptionInfo activeSubInfo = getDefaultDataSubId();

        SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(activeSubInfo);

        SubscriptionInfo currentDataSubInfo = getDefaultDataSubInfo();

        SubscriptionInfo newSubInfo = getNonDefaultDataSubscriptionInfo(currentDataSubInfo);



        if (newSubInfo == null || activeSubInfo == null) {

        if (newSubInfo == null || currentDataSubInfo == null) {

            Log.d(TAG, "one of target SubscriptionInfos is null");

            dismiss();

            return;

        }



        Log.d(TAG, "newSubId: " + newSubInfo.getSubscriptionId()

                + "currentDataSubID: " + currentDataSubInfo.getSubscriptionId());

        setTargetSubscriptionInfo(newSubInfo);



        CharSequence newDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(

                newSubInfo, getContext());

        CharSequence currentDataCarrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(

                activeSubInfo, getContext());

                currentDataSubInfo, getContext());



        String positive = getContext().getString(

                R.string.select_specific_sim_for_data_button, newDataCarrierName);