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

Commit 0adb8dc5 authored by changbetty's avatar changbetty Committed by Betty Chang
Browse files

To get Display name by active subscription info 

Bug: 206601918
Test: manual test and test team verified pass
Change-Id: Id156b3c5c65ff3af25f74721db27f46c08f3543e
parent 2d529a4f

src/com/android/settings/wifi/WifiConfigController.java

+8 −4
Original line number Diff line number Diff line
@@ -1503,11 +1503,15 @@ public class WifiConfigController implements TextWatcher, 
        }



        // Shows display name of each active subscription.

        final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(

                mContext).values().stream().toArray(String[]::new);

        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));

        final ArrayList<CharSequence> displayNames = new ArrayList<>();

        for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) {

            displayNames.add(

                SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));

        }

        mEapSimSpinner.setAdapter(

            getSpinnerAdapter(displayNames.toArray(new String[displayNames.size()])));

        mEapSimSpinner.setSelection(0 /* position */);

        if (displayNames.length == 1) {

        if (displayNames.size() == 1) {

            mEapSimSpinner.setEnabled(false);

        }

    }

src/com/android/settings/wifi/WifiConfigController2.java

+8 −4
Original line number Diff line number Diff line
@@ -1482,11 +1482,15 @@ public class WifiConfigController2 implements TextWatcher, 
        }



        // Shows display name of each active subscription.

        final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(

                mContext).values().stream().toArray(String[]::new);

        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));

        final ArrayList<CharSequence> displayNames = new ArrayList<>();

        for (SubscriptionInfo activeSubInfo : mActiveSubscriptionInfos) {

            displayNames.add(

                    SubscriptionUtil.getUniqueSubscriptionDisplayName(activeSubInfo, mContext));

        }

        mEapSimSpinner.setAdapter(

                getSpinnerAdapter(displayNames.toArray(new String[displayNames.size()])));

        mEapSimSpinner.setSelection(0 /* position */);

        if (displayNames.length == 1) {

        if (displayNames.size() == 1) {

            mEapSimSpinner.setEnabled(false);

        }

    }