diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index b0d09e4c12a..7bdd77ca67c 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -355,8 +355,16 @@ public class WifiConfigController implements TextWatcher, if (config != null && config.isPasspoint()) { providerFriendlyName = config.providerFriendlyName; } + String suggestionOrSpecifierPackageName = null; + if (config != null + && (config.fromWifiNetworkSpecifier + || config.fromWifiNetworkSuggestion)) { + suggestionOrSpecifierPackageName = config.creatorName; + } String summary = AccessPoint.getSummary( - mConfigUi.getContext(), state, isEphemeral, providerFriendlyName); + mConfigUi.getContext(), state, isEphemeral, + suggestionOrSpecifierPackageName, + providerFriendlyName); addRow(group, R.string.wifi_status, summary); } diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java index 6c1a3fc7865..b06343331f3 100644 --- a/src/com/android/settings/wifi/WifiStatusTest.java +++ b/src/com/android/settings/wifi/WifiStatusTest.java @@ -299,7 +299,7 @@ public class WifiStatusTest extends Activity { WifiInfo info = mWifiManager.getConnectionInfo(); String summary = AccessPoint.getSummary(this, info.getSSID(), networkInfo.getDetailedState(), - info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID, null); + info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID, null, null); mNetworkState.setText(summary); } }