diff options
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 03c620580423..a29cf8449e51 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -99,6 +99,8 @@ <string name="connected_via_network_scorer_default">Automatically connected via network rating provider</string> <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] --> <string name="connected_via_passpoint">Connected via %1$s</string> + <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] --> + <string name="ssid_by_passpoint_provider"><xliff:g id="ssid" example="Cafe Wifi">%1$s</xliff:g> by <xliff:g id="passpointProvider" example="Passpoint Provider">%2$s</xliff:g></string> <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] --> <string name="available_via_passpoint">Available via %1$s</string> <!-- Package name for Settings app--> diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 988541b90921..1ae1d56aacc8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -884,7 +884,7 @@ public class AccessPoint implements Comparable<AccessPoint> { if (isActive()) { if (isPasspoint()) { // This is the active connection on passpoint - summary.append(getSummary(mContext, getDetailedState(), + summary.append(getSummary(mContext, ssid, getDetailedState(), false, mConfig.providerFriendlyName)); } else if (mConfig != null && getDetailedState() == DetailedState.CONNECTED && mIsCarrierAp) { @@ -1294,11 +1294,11 @@ public class AccessPoint implements Comparable<AccessPoint> { public static String getSummary(Context context, String ssid, DetailedState state, boolean isEphemeral, String passpointProvider) { - if (state == DetailedState.CONNECTED && ssid == null) { - if (TextUtils.isEmpty(passpointProvider) == false) { + if (state == DetailedState.CONNECTED) { + if (!TextUtils.isEmpty(passpointProvider)) { // Special case for connected + passpoint networks. - String format = context.getString(R.string.connected_via_passpoint); - return String.format(format, passpointProvider); + String format = context.getString(R.string.ssid_by_passpoint_provider); + return String.format(format, ssid, passpointProvider); } else if (isEphemeral) { // Special case for connected + ephemeral networks. final NetworkScoreManager networkScoreManager = context.getSystemService( |