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

AccessPoint: App attribution for suggestion/specifier

Browse Source 
Bug: 115504887
Bug: 113878056
Test: atest AccessPointTest WifiTrackerTest
Test: Manual UI verification
Change-Id: I104fb6f428e66ab15ab1e0d0358da39652c28115
This commit is contained in:
Roshan Pius
2019-01-23 15:43:35 -08:00
parent 1fe41d44fe
commit 896cfd538c
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

@@ -355,8 +355,16 @@ public class WifiConfigController implements TextWatcher,
if (config != null && config.isPasspoint()) { if (config != null && config.isPasspoint()) {
providerFriendlyName = config.providerFriendlyName; providerFriendlyName = config.providerFriendlyName;
} }
String suggestionOrSpecifierPackageName = null;
if (config != null
&& (config.fromWifiNetworkSpecifier
|| config.fromWifiNetworkSuggestion)) {
suggestionOrSpecifierPackageName = config.creatorName;
}
String summary = AccessPoint.getSummary( String summary = AccessPoint.getSummary(
mConfigUi.getContext(), state, isEphemeral, providerFriendlyName); mConfigUi.getContext(), state, isEphemeral,
suggestionOrSpecifierPackageName,
providerFriendlyName);
addRow(group, R.string.wifi_status, summary); 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(); WifiInfo info = mWifiManager.getConnectionInfo();
String summary = AccessPoint.getSummary(this, info.getSSID(), String summary = AccessPoint.getSummary(this, info.getSSID(),
networkInfo.getDetailedState(), networkInfo.getDetailedState(),
info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID, null); info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID, null, null);
mNetworkState.setText(summary); mNetworkState.setText(summary);
} }
} }