PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AccessPoint: App attribution for suggestion/specifier"

Browse Source
This commit is contained in:
Roshan Pius
2019-01-30 03:03:20 +00:00
committed by Android (Google) Code Review
parent 3dc845a181 896cfd538c
commit 04dd29fc38
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -359,8 +359,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);
}

2
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -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);
}
}