From 0adb8dc55aa6419c2be0e31cbbf93ca1aace3136 Mon Sep 17 00:00:00 2001 From: changbetty Date: Fri, 26 Nov 2021 06:33:41 +0000 Subject: [PATCH] To get Display name by active subscription info Bug: 206601918 Test: manual test and test team verified pass Change-Id: Id156b3c5c65ff3af25f74721db27f46c08f3543e --- .../android/settings/wifi/WifiConfigController.java | 12 ++++++++---- .../android/settings/wifi/WifiConfigController2.java | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 408ffbe5a96..0c063db8a78 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -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 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); } } diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java index 011c9709c00..127c882340c 100644 --- a/src/com/android/settings/wifi/WifiConfigController2.java +++ b/src/com/android/settings/wifi/WifiConfigController2.java @@ -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 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); } }