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

Merge "Updated arguments for AccessPoint.getSummary calls"

Browse Source
This commit is contained in:
Quang Luong
2019-02-01 03:43:56 +00:00
committed by Android (Google) Code Review
parent 158fd441ff cb0b08aac2
commit fd9cdb50c5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,9 +366,8 @@ public class WifiConfigController implements TextWatcher,
suggestionOrSpecifierPackageName = config.creatorName; suggestionOrSpecifierPackageName = config.creatorName;
} }
String summary = AccessPoint.getSummary( String summary = AccessPoint.getSummary(
mConfigUi.getContext(), state, isEphemeral, mConfigUi.getContext(), /* ssid */ null, state, isEphemeral,
suggestionOrSpecifierPackageName, suggestionOrSpecifierPackageName);
providerFriendlyName);
addRow(group, R.string.wifi_status, summary); addRow(group, R.string.wifi_status, summary);
} }

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

@@ -299,7 +299,8 @@ 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, null); info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID,
/* suggestionOrSpecifierPackageName */ null);
mNetworkState.setText(summary); mNetworkState.setText(summary);
} }
} }